OCDB calib data: removal of gain values. Will be put in a separate OCDB entry as...

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

diff --git a/EMCAL/AliEMCALPreprocessor.cxx b/EMCAL/AliEMCALPreprocessor.cxx
index c5f750508c3bbea27a91f992069bac149e5cac09..aa52cd228c23decd7d869be43b1126e110750374 100644 (file)
--- a/EMCAL/AliEMCALPreprocessor.cxx
+++ b/EMCAL/AliEMCALPreprocessor.cxx
@@ -225,8 +225,7 @@ UInt_t AliEMCALPreprocessor::Process(TMap* dcsAliasMap)
   }
   
   // SIGNAL/LED ENTRIES:
-  
-  if( runType == kStandAloneRunType ) {
+  if( runType == kPhysicsRunType || runType == kStandAloneRunType ) {
     Int_t numSources = 1;
     Int_t signalSource[2] = {AliShuttleInterface::kDAQ,AliShuttleInterface::kHLT} ;
     TString source = fConfEnv->GetValue("Signal","DAQ");
@@ -311,21 +310,13 @@ UInt_t AliEMCALPreprocessor::ExtractPedestals(Int_t sourceFXS)
   UInt_t result=0;
   //
   //  Read pedestal file from file exchange server
-  //  Keep original entry from OCDB in case no new pedestals are available
+  //  Only store if new pedestal info is available
   //
-  AliCaloCalibPedestal *calibPed=0;
-  AliCDBEntry* entry = GetFromOCDB("Calib", "Pedestals");
-  if (entry) calibPed = (AliCaloCalibPedestal*)entry->GetObject();
-  if ( calibPed==NULL ) {
-    Log("AliEMCALPreprocessor: No previous EMCAL pedestal entry available.\n");
-    calibPed = new AliCaloCalibPedestal(AliCaloCalibPedestal::kEmCal);
-  }
+  AliCaloCalibPedestal *calibPed = new AliCaloCalibPedestal(AliCaloCalibPedestal::kEmCal);
   
   TList* list = GetFileSources(sourceFXS,"pedestals");
   if (list && list->GetEntries()>0) {
     
-    calibPed->Reset(); // let's make a fresh start before possibly adding stuff below
-    
     //  loop through all files from LDCs
 
     int changes = 0;
@@ -387,25 +378,13 @@ UInt_t AliEMCALPreprocessor::ExtractSignal(Int_t sourceFXS)
   UInt_t result=0;
   //
   //  Read signal file from file exchange server
-  //  Keep original entry from OCDB in case no new signal are available
+  //  Only store if new signal info is available
   //
-  AliCaloCalibSignal *calibSig=0;
-  AliCDBEntry* entry = GetFromOCDB("Calib", "LED");
-  if (entry) calibSig = (AliCaloCalibSignal*)entry->GetObject();
-  if ( calibSig==NULL ) {
-    Log("AliEMCALPreprocessor: No previous EMCAL signal entry available.\n");
-    calibSig = new AliCaloCalibSignal(AliCaloCalibSignal::kEmCal); 
-  }
+  AliCaloCalibSignal *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
     
     int changes = 0;