A few mods in the GRP preprocessor (to get some greens finally)

diff --git a/STEER/AliGRPDCS.cxx b/STEER/AliGRPDCS.cxx
index 86df227ff55294eeac140e37d30514dcbde2d9f0..d3b539b1c81319a303de2a76c485861913cf3458 100644 (file)
--- a/STEER/AliGRPDCS.cxx
+++ b/STEER/AliGRPDCS.cxx
@@ -50,10 +50,11 @@ AliGRPDCS::AliGRPDCS(TObjArray *dcsArray, UInt_t fStart, UInt_t fStop):
 //___________________________________________________________________________
 AliGRPDCS::AliGRPDCS(const AliGRPDCS& grpDcs):
   TObject(grpDcs), 
-  fStartTime(grpDcs.fStartTime), fStopTime(grpDcs.fStopTime) {
+  fStartTime(grpDcs.fStartTime), fStopTime(grpDcs.fStopTime), 
+  fDCSArray(grpDcs.fDCSArray) {
   //copy constructor
 
-  if (grpDcs.fDCSArray) fDCSArray = new TObjArray();
+  //if (grpDcs.fDCSArray) fDCSArray = new TObjArray();
 }
 
 //_______________________________________________________________
@@ -81,7 +82,6 @@ const char* AliGRPDCS::ProcessDCS(Int_t iType) {
   }
   case 3: {
     fDCSDataPointValue += ProcessString();
-    cout<<fDCSDataPointValue.Data()<<endl;
     break;
   }
   case 4: {
@@ -91,7 +91,7 @@ const char* AliGRPDCS::ProcessDCS(Int_t iType) {
   default: break;
   }//switch
 
-  cout<<fDCSDataPointValue.Data()<<endl;
+  //cout<<fDCSDataPointValue.Data()<<endl;
   return fDCSDataPointValue.Data();
 }
 
@@ -137,6 +137,8 @@ const char* AliGRPDCS::ProcessUInt() {
 const char* AliGRPDCS::ProcessFloat() {
   Float_t fFDCSArraySum = 0.0, fFDCSArrayMean = 0.0;
   Int_t iCounts = 0;
+  //printf("Entries: %d\n",fDCSArray->GetEntries());
+  //printf("Start: %d - Stop: %d\n",fStartTime,fStopTime);
   for(Int_t i = 0; i < fDCSArray->GetEntries(); i++) {
     AliDCSValue *v = (AliDCSValue *)fDCSArray->At(i);
     if((v->GetTimeStamp() >= fStartTime) &&(v->GetTimeStamp() <= fStopTime)) {
@@ -155,55 +157,40 @@ const char* AliGRPDCS::ProcessFloat() {
 //_______________________________________________________________
 const char* AliGRPDCS::ProcessString() {
   TString fDCSString, fDCSTemp;
-  Bool_t kFound = kFALSE;
-  Int_t iCount = 0;
 
   AliDCSValue *v = 0x0;
 
-  printf("Entries: %d\n",fDCSArray->GetEntries());
-  printf("Start: %d - Stop: %d\n",fStartTime,fStopTime);
-
-  while(!kFound) {
+  //printf("Entries: %d\n",fDCSArray->GetEntries());
+  //printf("Start: %d - Stop: %d\n",fStartTime,fStopTime);
+  
+  for(Int_t iCount = 0; iCount < fDCSArray->GetEntries(); iCount++) {
     v = (AliDCSValue *)fDCSArray->At(iCount);
-    iCount += 1;
-    cout<<"Time: "<<v->GetTimeStamp()<<endl;
-    if((v->GetTimeStamp() >= fStartTime) &&(v->GetTimeStamp() <= fStopTime)) kFound = kTRUE;
-  }
-  fDCSTemp = v->GetChar();
-  cout<<"Found: "<<kFound<<" - String: "<<fDCSTemp.Data()<<endl;
-  for(Int_t i = 0; i < fDCSArray->GetEntries(); i++) {
-    AliDCSValue *v1 = (AliDCSValue *)fDCSArray->At(i);
-    if((v1->GetTimeStamp() >= fStartTime) &&(v1->GetTimeStamp() <= fStopTime)) {
-      fDCSString = v1->GetChar();
-      if(fDCSTemp != fDCSString) AliFatal("DCS data point value changed within the run!!!");
-    }
+    if ((v->GetTimeStamp() >= fStartTime) && (v->GetTimeStamp() <= fStopTime)) 
+      AliError(Form("DCS values for the parameter changed within the queried interval"));
+    if (v->GetTimeStamp() > fStopTime) continue;
+    fDCSString = v->GetChar();    
   }
+  
   TString fDCSDataPointValue = fDCSString;
-  cout<<"Returned String: "<<fDCSDataPointValue.Data()<<endl;
+  //cout<<"Returned String: "<<fDCSDataPointValue.Data()<<endl;
 
   return fDCSDataPointValue.Data();
 }
 
 //_______________________________________________________________
 const char* AliGRPDCS::ProcessBoolean() {
-  Bool_t fDCSBool = kTRUE, fDCSTemp = kTRUE;
-  Bool_t kFound = kFALSE;
-  Int_t iCount = 0;
+  Bool_t fDCSBool = kTRUE;
 
   AliDCSValue *v = 0x0;
-  while(!kFound) {
+
+  for(Int_t iCount = 0; iCount < fDCSArray->GetEntries(); iCount++) {
     v = (AliDCSValue *)fDCSArray->At(iCount);
-    iCount += 1;
-    if((v->GetTimeStamp() >= fStartTime) &&(v->GetTimeStamp() <= fStopTime)) kFound = kTRUE;
-  }
-  fDCSTemp = v->GetBool();
-  for(Int_t i = 0; i < fDCSArray->GetEntries(); i++) {
-    AliDCSValue *v1 = (AliDCSValue *)fDCSArray->At(i);
-    if((v1->GetTimeStamp() >= fStartTime) &&(v1->GetTimeStamp() <= fStopTime)) {
-      fDCSBool = v1->GetBool();
-      if(fDCSTemp != fDCSBool) AliFatal("DCS data point value changed within the run!!!");
-    }
+    if ((v->GetTimeStamp() >= fStartTime) && (v->GetTimeStamp() <= fStopTime)) 
+      AliError(Form("DCS values for the parameter changed within the queried interval"));
+    if (v->GetTimeStamp() > fStopTime) continue;
+    fDCSBool = v->GetBool();    
   }
+
   TString fDCSDataPointValue = fDCSBool;
 
   return fDCSDataPointValue.Data();

diff --git a/STEER/AliGRPPreprocessor.cxx b/STEER/AliGRPPreprocessor.cxx
index dae280fd692c600249261c1b63feb78fbfbcb1e3..b21f51d38268bca45f77f618a4a42c639fac2dda 100644 (file)
--- a/STEER/AliGRPPreprocessor.cxx
+++ b/STEER/AliGRPPreprocessor.cxx
@@ -86,19 +86,17 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
   TList* list = GetFileSources(kDAQ);
   TIterator* iter = list->MakeIterator();
   TObject* obj = 0;
-  while ((obj = iter->Next()))
-  {
-       TObjString* objStr = dynamic_cast<TObjString*> (obj);
-       if (objStr)
-       {
-               Log(Form("Found source %s", objStr->String().Data()));
-               TList* list2 = GetFileIDs(kDAQ, objStr->String());
-               list2->Print();
-               delete list2;
-       }
-   }
-   delete iter;
-   delete list;  
+  while ((obj = iter->Next())) {
+    TObjString* objStr = dynamic_cast<TObjString*> (obj);
+    if (objStr) {
+      Log(Form("Found source %s", objStr->String().Data()));
+      TList* list2 = GetFileIDs(kDAQ, objStr->String());
+      list2->Print();
+      delete list2;
+    }
+  }
+  delete iter;
+  delete list;  
   
   //===========//
   //DCS data points
@@ -108,6 +106,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
     Log(Form("LHCState not found!!!"));
     return 1;
   }
+  AliInfo(Form("==========LHCState==========="));
   AliGRPDCS *dcs1 = new AliGRPDCS(aliasLHCState,iStartTime,iStopTime);
   TString sLHCState = dcs1->ProcessDCS(3);  
   if (sLHCState) {
@@ -121,6 +120,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
     Log(Form("LHCPeriod not found!!!"));
     return 1;
   }
+  AliInfo(Form("==========LHCPeriod==========="));
   AliGRPDCS *dcs2 = new AliGRPDCS(aliasLHCPeriod,iStartTime,iStopTime);
   TString sLHCPeriod = dcs2->ProcessDCS(3);  
   if (sLHCPeriod) {
@@ -134,6 +134,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
     Log(Form("LHCLuminosity not found!!!"));
     return 1;
   }
+  AliInfo(Form("==========LHCLuminosity==========="));
   AliGRPDCS *dcs3 = new AliGRPDCS(aliasLHCLuminosity,iStartTime,iStopTime);
   TString sMeanLHCLuminosity = dcs3->ProcessDCS(2);  
   if (sMeanLHCLuminosity) {
@@ -147,6 +148,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
     Log(Form("BeamIntensity not found!!!"));
     return 1;
   }
+  AliInfo(Form("==========BeamIntensity==========="));
   AliGRPDCS *dcs4 = new AliGRPDCS(aliasBeamIntensity,iStartTime,iStopTime);
   TString sMeanBeamIntensity = dcs4->ProcessDCS(2);  
   if (sMeanBeamIntensity) {
@@ -160,6 +162,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
     Log(Form("L3Current not found!!!"));
     return 1;
   }
+  AliInfo(Form("==========L3Current==========="));
   AliGRPDCS *dcs5 = new AliGRPDCS(aliasL3Current,iStartTime,iStopTime);
   TString sMeanL3Current = dcs5->ProcessDCS(2);  
   if (sMeanL3Current) {
@@ -173,6 +176,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
     Log(Form("L3Polarity not found!!!"));
     return 1;
   }
+  AliInfo(Form("==========L3Polarity==========="));
   AliGRPDCS *dcs6 = new AliGRPDCS(aliasL3Polarity,iStartTime,iStopTime);
   TString sL3Polarity = dcs6->ProcessDCS(4);  
   if (sL3Polarity) {
@@ -186,6 +190,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
     Log(Form("DipoleCurrent not found!!!"));
     return 1;
   }
+  AliInfo(Form("==========DipoleCurrent==========="));
   AliGRPDCS *dcs7 = new AliGRPDCS(aliasDipoleCurrent,iStartTime,iStopTime);
   TString sMeanDipoleCurrent = dcs7->ProcessDCS(2);  
   if (sMeanDipoleCurrent) {
@@ -199,6 +204,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
     Log(Form("DipolePolarity not found!!!"));
     return 1;
   }
+  AliInfo(Form("==========DipolePolarity==========="));
   AliGRPDCS *dcs8 = new AliGRPDCS(aliasDipolePolarity,iStartTime,iStopTime);
   TString sDipolePolarity = dcs8->ProcessDCS(4);  
   if (sDipolePolarity) {
@@ -212,6 +218,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
     Log(Form("CavernTemperature not found!!!"));
     return 1;
   }
+  AliInfo(Form("==========CavernTemperature==========="));
   AliGRPDCS *dcs9 = new AliGRPDCS(aliasCavernTemperature,iStartTime,iStopTime);
   TString sMeanCavernTemperature = dcs9->ProcessDCS(2);  
   if (sMeanCavernTemperature) {
@@ -225,6 +232,7 @@ UInt_t AliGRPPreprocessor::Process(TMap* valueMap) {
     Log(Form("CavernPressure not found!!!"));
     return 1;
   }
+  AliInfo(Form("==========CavernPressure==========="));
   AliGRPDCS *dcs10 = new AliGRPDCS(aliasCavernPressure,iStartTime,iStopTime);
   TString sMeanCavernPressure = dcs10->ProcessDCS(2);  
   if (sMeanCavernPressure) {