- fixed the format of the floats that become part of the output file name

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALPreprocessor.cxx

diff --git a/EMCAL/AliEMCALPreprocessor.cxx b/EMCAL/AliEMCALPreprocessor.cxx
index a035ee957769c66ad37c587c2c94bccce8779451..4f7056292fadaa204b2c66b79745c18095427a5c 100644 (file)
--- a/EMCAL/AliEMCALPreprocessor.cxx
+++ b/EMCAL/AliEMCALPreprocessor.cxx
@@ -81,7 +81,6 @@ AliEMCALPreprocessor::AliEMCALPreprocessor(AliShuttleInterface* shuttle):
   // define run types to be processed
   AddRunType(kPedestalRunType);
   AddRunType(kPhysicsRunType);
-  AddRunType(kStandAloneRunType);
 }
 
 //______________________________________________________________________________________________
@@ -168,21 +167,22 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap)
   UInt_t dcsResult=0;
   if (errorHandling == "OFF" ) {
     if (!dcsAliasMap) dcsResult = kReturnCodeNoEntries;
-    if (dcsAliasMap->GetEntries() == 0 ) dcsResult = kReturnCodeNoEntries;  
+    else if (dcsAliasMap->GetEntries() == 0 ) dcsResult = kReturnCodeNoEntries;  
     status = new TParameter<int>("dcsResult",dcsResult);
     resultArray->Add(status);
   } 
   else {
     if (!dcsAliasMap) return kReturnCodeNoInfo;
-    if (dcsAliasMap->GetEntries() == 0 ) return kReturnCodeNoInfo;
+    else if (dcsAliasMap->GetEntries() == 0 ) return kReturnCodeNoInfo;
   }
   
+    
   TString runType = GetRunType();
   
   // Temperature sensors are processed by AliEMCALCalTemp
   TString tempConf = fConfEnv->GetValue("Temperature","ON");
   tempConf.ToUpper();
-  if (tempConf != "OFF" ) {
+  if (tempConf != "OFF" && dcsAliasMap ) {
     UInt_t tempResult = MapTemperature(dcsAliasMap);
     result=tempResult;
     status = new TParameter<int>("tempResult",tempResult);
@@ -199,7 +199,7 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap)
   
   // PEDESTAL ENTRIES:
   
-  if (runType == kPedestalRunType || runType == kStandAloneRunType) {
+  if ( runType == kPedestalRunType ) {
     Int_t numSources = 1;
     Int_t pedestalSource[2] = {AliShuttleInterface::kDAQ, AliShuttleInterface::kHLT} ;
     TString source = fConfEnv->GetValue("Pedestal","DAQ");
@@ -208,15 +208,15 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap)
       if ( source == "HLT") pedestalSource[0] = AliShuttleInterface::kHLT;
       if (!GetHLTStatus()) pedestalSource[0] = AliShuttleInterface::kDAQ;
       if (source == "HLTDAQ" ) {
-       numSources=2;
-       pedestalSource[0] = AliShuttleInterface::kHLT;
-       pedestalSource[1] = AliShuttleInterface::kDAQ;
+        numSources=2;
+        pedestalSource[0] = AliShuttleInterface::kHLT;
+        pedestalSource[1] = AliShuttleInterface::kDAQ;
       }
       if (source == "DAQHLT" ) numSources=2;
       UInt_t pedestalResult=0;
       for (Int_t i=0; i<numSources; i++ ) {    
-       pedestalResult = ExtractPedestals(pedestalSource[i]);
-       if ( pedestalResult == 0 ) break;
+        pedestalResult = ExtractPedestals(pedestalSource[i]);
+        if ( pedestalResult == 0 ) break;
       }
       result += pedestalResult;
       status = new TParameter<int>("pedestalResult",pedestalResult);
@@ -225,8 +225,7 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap)
   }
   
   // SIGNAL/LED ENTRIES:
-  
-  if( runType == kStandAloneRunType ) {
+  if( runType == kPhysicsRunType ) {
     Int_t numSources = 1;
     Int_t signalSource[2] = {AliShuttleInterface::kDAQ,AliShuttleInterface::kHLT} ;
     TString source = fConfEnv->GetValue("Signal","DAQ");
@@ -235,15 +234,15 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap)
       if ( source == "HLT") signalSource[0] = AliShuttleInterface::kHLT;
       if (!GetHLTStatus()) signalSource[0] = AliShuttleInterface::kDAQ;
       if (source == "HLTDAQ" ) {
-       numSources=2;
-       signalSource[0] = AliShuttleInterface::kHLT;
-       signalSource[1] = AliShuttleInterface::kDAQ;
+        numSources=2;
+        signalSource[0] = AliShuttleInterface::kHLT;
+        signalSource[1] = AliShuttleInterface::kDAQ;
       }
       if (source == "DAQHLT" ) numSources=2;
       UInt_t signalResult=0;
       for (Int_t i=0; i<numSources; i++ ) {    
-       signalResult = ExtractSignal(signalSource[i]);
-       if ( signalResult == 0 ) break;
+        signalResult = ExtractSignal(signalSource[i]);
+        if ( signalResult == 0 ) break;
       }
       result += signalResult;
       status = new TParameter<int>("signalResult",signalResult);
@@ -258,9 +257,11 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap)
     metaData.SetBeamPeriod(0);
     metaData.SetResponsible(kMetaResponsible);
     metaData.SetComment("Preprocessor AliEMCAL status.");
-    Store("Calib", "PreprocStatus", resultArray, &metaData, 0, kFALSE);
+    Bool_t storeOK = Store("Calib", "PreprocStatus", resultArray, &metaData, 0, kFALSE);
     resultArray->Delete();
-    return 0;
+    result = 0;
+    if ( !storeOK )  result=1;
+    return result;
   } 
   else { 
     return result;
@@ -314,7 +315,8 @@ UInt_t AliEMCALPreprocessor::ExtractPedestals(Int_t sourceFXS)
   //  Only store if new pedestal info is available
   //
   AliCaloCalibPedestal *calibPed = new AliCaloCalibPedestal(AliCaloCalibPedestal::kEmCal);
-  
+  calibPed->Init();
+
   TList* list = GetFileSources(sourceFXS,"pedestals");
   if (list && list->GetEntries()>0) {