Bug fix of FPE caused by large trigger amplitudes in rare cases

[u/mrichter/AliRoot.git] / PHOS / AliPHOSPreprocessor.cxx

diff --git a/PHOS/AliPHOSPreprocessor.cxx b/PHOS/AliPHOSPreprocessor.cxx
index f854e69f5743cdd3cf6e9895080877e6ff08d20b..44edd159526ba34dcff7d091ebb15a125eb9f532 100644 (file)
--- a/PHOS/AliPHOSPreprocessor.cxx
+++ b/PHOS/AliPHOSPreprocessor.cxx
@@ -161,10 +161,10 @@ Bool_t AliPHOSPreprocessor::ProcessLEDRun()
        for(Int_t row=0; row<nRow; row++) {
          
          if(clb) {
-           Float_t  hg2lg = clb->GetHighLowRatioEmc(mod+1,col+1,row+1);
-           Double_t coeff = clb->GetADCchannelEmc(mod+1,col+1,row+1);
-           calibData.SetADCchannelEmc(mod+1,col+1,row+1,coeff);
-           calibData.SetHighLowRatioEmc(mod+1,col+1,row+1,hg2lg);
+           Float_t  hg2lg = clb->GetHighLowRatioEmc(5-mod,col+1,row+1);
+           Double_t coeff = clb->GetADCchannelEmc(5-mod,col+1,row+1);
+           calibData.SetADCchannelEmc(5-mod,col+1,row+1,coeff);
+           calibData.SetHighLowRatioEmc(5-mod,col+1,row+1,hg2lg);
          }     
   
          //High Gain to Low Gain ratio
@@ -364,6 +364,8 @@ Bool_t AliPHOSPreprocessor::CalibrateEmc()
 
   for (Int_t i=0; i<2; i++) {
 
+    if(system[i] == kHLT) continue;
+
     AliPHOSEmcCalibData calibData;
     list = GetFileSources(system[i], "AMPLITUDES");
   
@@ -405,19 +407,22 @@ Bool_t AliPHOSPreprocessor::CalibrateEmc()
     else
       lastCalib = (AliPHOSEmcCalibData*)entryEmc->GetObject();
 
-    if(lastCalib)
-      result[i] *= DoCalibrateEmc(system[i],list,badMap,*lastCalib);
-    else
+    if(lastCalib) 
+      result[i] *= DoCalibrateEmc(system[i],list,badMap,*lastCalib);    
+    else 
       result[i] *= DoCalibrateEmc(system[i],list,badMap,calibData);
-
+    
     //Store EMC calibration data
-
     AliCDBMetaData emcMetaData;
     
     if(lastCalib)
-      result[i] *= Store(path.Data(), "EmcGainPedestals", lastCalib, &emcMetaData, 0, kTRUE);
+      result[i] *= Store(path.Data(), "EmcGainPedestals", lastCalib, &emcMetaData, 0, kFALSE);
     else
-      result[i] *= Store(path.Data(), "EmcGainPedestals", &calibData, &emcMetaData, 0, kTRUE);
+      result[i] *= Store(path.Data(), "EmcGainPedestals", &calibData, &emcMetaData, 0, kFALSE);
+
+    //Store reference data
+    Bool_t refOK = StoreReferenceEmc(system[i],list);
+    if(refOK) Log(Form("Reference data for %s amplitudes successfully stored.",sysn[i]));
     
   }
   
@@ -425,6 +430,23 @@ Bool_t AliPHOSPreprocessor::CalibrateEmc()
   else return kFALSE;
 }
 
+Bool_t AliPHOSPreprocessor::StoreReferenceEmc(Int_t system, TList* list)
+{
+  //Put 2D calibration histograms (E vs Time) prepared by DAQ/HLT to the reference storage.
+  //system is DAQ or HLT, TList is the list of FES sources.
+
+  if(system!=kDAQ) return kFALSE;
+
+  TObjString *source = dynamic_cast<TObjString *> (list->First());
+  if(!source) return kFALSE;
+
+  TString fileName = GetFile(system, "AMPLITUDES", source->GetName());
+
+  Bool_t resultRef = StoreReferenceFile(fileName.Data(),"CalibRefPHOS.root");
+  return resultRef;
+
+}
+
 
 Bool_t AliPHOSPreprocessor::DoCalibrateEmc(Int_t system, TList* list, const AliPHOSEmcBadChannelsMap* badMap, AliPHOSEmcCalibData& calibData)
 {
@@ -436,7 +458,7 @@ Bool_t AliPHOSPreprocessor::DoCalibrateEmc(Int_t system, TList* list, const AliP
   // It is a responsibility of the SHUTTLE framework to form the fileName.
 
   gRandom->SetSeed(0); //the seed is set to the current  machine clock!
-  Int_t minEntries=100; // recalculate calibration coeff. if Nentries > minEntries.
+  Int_t minEntries=1000; // recalculate calibration coeff. if Nentries > minEntries.
 
   TIter iter(list);
   TObjString *source;