Adding functionality to retrieve logbook_trigger_config.alignmentFile from

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

diff --git a/EMCAL/AliEMCALPreprocessor.cxx b/EMCAL/AliEMCALPreprocessor.cxx
index fddb2e142e4f3d8ecfd83aa68c41531245021273..7d0eb64496a182257aafecf8a8c35e7a69ac116f 100644 (file)
--- a/EMCAL/AliEMCALPreprocessor.cxx
+++ b/EMCAL/AliEMCALPreprocessor.cxx
@@ -46,7 +46,7 @@ const Int_t kDiffCutTemp = 5;              // discard temperature differences >
 const TString kPedestalRunType = "PEDESTAL";  // pedestal run identifier
 const TString kPhysicsRunType = "PHYSICS";   // physics run identifier
 const TString kStandAloneRunType = "STANDALONE"; // standalone run identifier
-const TString kAmandaTemp = "EMC_PT_%d_TEMPERATURE"; // Amanda string for temperature entries
+const TString kAmandaTemp = "PT_%02d.Temperature"; // Amanda string for temperature entries
 //const Double_t kFitFraction = 0.7;                 // Fraction of DCS sensor fits required 
 const Double_t kFitFraction = -1.0;          // Don't require minimum number of fits during commissioning 
 
@@ -126,7 +126,7 @@ void AliEMCALPreprocessor::Initialize(Int_t run, UInt_t startTime,
   AliCDBEntry* entry = GetFromOCDB("Config", "Preprocessor");
   if (entry) fConfEnv = (TEnv*) entry->GetObject();
   if ( fConfEnv==0 ) {
-    Log("AliEMCALPreprocsessor: Preprocessor Config OCDB entry missing.\n");
+    Log("AliEMCALPreprocessor: Preprocessor Config OCDB entry missing.\n");
     fConfigOK = kFALSE;
     return;
   }
@@ -140,7 +140,7 @@ void AliEMCALPreprocessor::Initialize(Int_t run, UInt_t startTime,
     entry = GetFromOCDB("Config", "Temperature");
     if (entry) confTree = (TTree*) entry->GetObject();
     if ( confTree==0 ) {
-      Log("AliEMCALPreprocsessor: Temperature Config OCDB entry missing.\n");
+      Log("AliEMCALPreprocessor: Temperature Config OCDB entry missing.\n");
       fConfigOK = kFALSE;
       return;
     }
@@ -317,7 +317,7 @@ UInt_t AliEMCALPreprocessor::ExtractPedestals(Int_t sourceFXS)
   AliCDBEntry* entry = GetFromOCDB("Calib", "Pedestals");
   if (entry) calibPed = (AliCaloCalibPedestal*)entry->GetObject();
   if ( calibPed==NULL ) {
-    Log("AliEMCALPreprocsessor: No previous EMCAL pedestal entry available.\n");
+    Log("AliEMCALPreprocessor: No previous EMCAL pedestal entry available.\n");
     calibPed = new AliCaloCalibPedestal(AliCaloCalibPedestal::kEmCal);
   }
   
@@ -390,17 +390,21 @@ UInt_t AliEMCALPreprocessor::ExtractSignal(Int_t sourceFXS)
   //  Keep original entry from OCDB in case no new signal are available
   //
   AliCaloCalibSignal *calibSig=0;
-  AliCDBEntry* entry = GetFromOCDB("Calib", "Signal");
+  AliCDBEntry* entry = GetFromOCDB("Calib", "LED");
   if (entry) calibSig = (AliCaloCalibSignal*)entry->GetObject();
   if ( calibSig==NULL ) {
-    Log("AliEMCALPreprocsessor: No previous EMCAL signal entry available.\n");
+    Log("AliEMCALPreprocessor: No previous EMCAL signal entry available.\n");
     calibSig = new AliCaloCalibSignal(AliCaloCalibSignal::kEmCal); 
   }
   
   TList* list = GetFileSources(sourceFXS,"signal");
   if (list && list->GetEntries()>0) {
+
+    /* DS: 17 June 2008 - commented out this reset to avoid crash in shuttle.
+           Not sure why it occurs, in standalone tests a Reset() seemed to work OK..
     
     calibSig->Reset(); // let's make a fresh start before possibly adding stuff below
+    */
     
     //  loop through all files from LDCs
     
@@ -445,7 +449,7 @@ UInt_t AliEMCALPreprocessor::ExtractSignal(Int_t sourceFXS)
       metaData.SetResponsible(kMetaResponsible);
       metaData.SetComment(kMetaComment); 
       
-      Bool_t storeOK = Store("Calib", "Signal", calibSig, &metaData, 0, kFALSE);
+      Bool_t storeOK = Store("Calib", "LED", calibSig, &metaData, 0, kFALSE);
       if ( !storeOK ) result++;
     }
   }