Bug in AliZDCReconstructor::Reconstruct corrected

[u/mrichter/AliRoot.git] / ZDC / AliZDCReconstructor.cxx

diff --git a/ZDC/AliZDCReconstructor.cxx b/ZDC/AliZDCReconstructor.cxx
index 33efa0b479094e23cae4c69ab5581a0bd9fe1577..ccfbeedccdcf6ad121c12b1e51bf8785a4d6cd8a 100644 (file)
--- a/ZDC/AliZDCReconstructor.cxx
+++ b/ZDC/AliZDCReconstructor.cxx
@@ -100,7 +100,7 @@ void AliZDCReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) co
        tZN1Corr[quad] = (Float_t) (digit.GetADCValue(0)-meanPed[pedindex]);
        if(tZN1Corr[quad]<0.) tZN1Corr[quad] = 0.;
        tZN1Corr[quad+5] = (Float_t) (digit.GetADCValue(1)-meanPed[pedindex+kNch]);
-       if(tZN1Corr[quad+5]<0.) tZN1Corr[quad] = 0.;
+       if(tZN1Corr[quad+5]<0.) tZN1Corr[quad+5] = 0.;
        //printf("\t pedindex %d tZN1Corr[%d] = %1.0f tZN1Corr[%d] = %1.0f", 
        //      pedindex, quad, tZN1Corr[quad], quad+5, tZN1Corr[quad+5]);
     }
@@ -109,7 +109,7 @@ void AliZDCReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) co
        tZP1Corr[quad] = (Float_t) (digit.GetADCValue(0)-meanPed[pedindex]);
        if(tZP1Corr[quad]<0.) tZP1Corr[quad] = 0.;
        tZP1Corr[quad+5] = (Float_t) (digit.GetADCValue(1)-meanPed[pedindex+kNch]);
-       if(tZP1Corr[quad+5]<0.) tZP1Corr[quad] = 0.;
+       if(tZP1Corr[quad+5]<0.) tZP1Corr[quad+5] = 0.;
        //printf("\t pedindex %d tZP1Corr[%d] = %1.0f tZP1Corr[%d] = %1.0f", 
        //      pedindex, quad, tZP1Corr[quad], quad+5, tZP1Corr[quad+5]);
     }
@@ -278,7 +278,13 @@ void AliZDCReconstructor::ReconstructEventpp(TTree *clustersTree, Float_t* ZN1AD
   }
   // --- Energy calibration factors ------------------------------------
   Float_t calibEne[4];
-  for(Int_t ij=0; ij<4; ij++) calibEne[ij] = fECalibData->GetEnCalib(ij);
+  // *********************************************************************
+  // **** Until the beam type info isn't known @ reconstruction level ****
+  // **** the energy calibration coefficient are manually set to 1    ****
+  // **** as it will be in real life for pp data taking               ****
+  // *********************************************************************
+  //for(Int_t ij=0; ij<4; ij++) calibEne[ij] = fECalibData->GetEnCalib(ij);
+  for(Int_t ij=0; ij<4; ij++) calibEne[ij] = 1.;
   
   // Equalization of detector responses
   Float_t equalTowZN1[10], equalTowZN2[10], equalTowZP1[10], equalTowZP2[10];
@@ -341,7 +347,7 @@ void AliZDCReconstructor::ReconstructEventpp(TTree *clustersTree, Float_t* ZN1AD
   
   // create the output tree
   AliZDCReco reco(calibSumZN1, calibSumZP1, calibSumZN2, calibSumZP2, 
-                 calibTowZN1, calibTowZN2, calibTowZP1, calibTowZP2, 
+                 calibTowZN1, calibTowZP1, calibTowZN2, calibTowZP2, 
                  ZEM1ADCCorr, ZEM2ADCCorr, PMRef1, PMRef2,
                  nDetSpecNLeft, nDetSpecPLeft, nDetSpecNRight, nDetSpecPRight, 
                  nGenSpecNLeft, nGenSpecPLeft, nGenSpecLeft, nGenSpecNRight, 
@@ -517,7 +523,7 @@ void AliZDCReconstructor::ReconstructEventPbPb(TTree *clustersTree, Float_t* ZN1
   
   // create the output tree
   AliZDCReco reco(calibSumZN1, calibSumZP1, calibSumZN2, calibSumZP2, 
-                 calibTowZN1, calibTowZN2, calibTowZP1, calibTowZP2, 
+                 calibTowZN1, calibTowZP1, calibTowZN2, calibTowZP2, 
                  ZEM1ADCCorr, ZEM2ADCCorr, PMRef1, PMRef2,
                  nDetSpecNLeft, nDetSpecPLeft, nDetSpecNRight, nDetSpecPRight, 
                  nGenSpecNLeft, nGenSpecPLeft, nGenSpecLeft, nGenSpecNRight, 
@@ -619,7 +625,7 @@ AliZDCCalib* AliZDCReconstructor::GetECalibData() const
 
   // Getting energy and equalization calibration object for ZDC set
 
-  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/Calib");
+  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/EMDCalib");
   if(!entry) AliFatal("No calibration data loaded!");  
 
   AliZDCCalib *calibdata = dynamic_cast<AliZDCCalib*>  (entry->GetObject());