X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCReconstructor.cxx;h=cc68018568e77fa68f39c4468c00560c67cbff5f;hb=dfa968c24f34792c7794abcd0698475f609c07a1;hp=59a2b004ae8f5b45006265d20e3c6ef6ad40719b;hpb=124343813e34e1e6cee44298c99f8a86d502e7e6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDCReconstructor.cxx b/ZDC/AliZDCReconstructor.cxx
index 59a2b004ae8..cc68018568e 100644
--- a/ZDC/AliZDCReconstructor.cxx
+++ b/ZDC/AliZDCReconstructor.cxx
@@ -118,18 +118,10 @@ void AliZDCReconstructor::Init()
       AliError("\t ZDC does not reconstruct event 4 UNKNOWN beam type\n");
       return;
     }
-    if((beamType.CompareTo("P-P")) == 0){
-      fRecoMode=1;
-      fRecoParam = (AliZDCRecoParampp*) GetppRecoParamFromOCDB();
-      AliInfo(" Getting AliZDCRecoParampp object from OCDB \n");
-    }
+    if((beamType.CompareTo("P-P")) == 0) fRecoMode=1;
     else if((beamType.CompareTo("A-A")) == 0){
       fRecoMode=2;
-      if(fIsCalibrationMB == kFALSE){ 
-         fRecoParam = (AliZDCRecoParamPbPb*) GetPbPbRecoParamFromOCDB();
-         AliInfo(" Getting AliZDCRecoParamPbPb object from OCDB\n");
-      }
-      else{
+      if(fIsCalibrationMB == kTRUE){ 
         fRecoParam = new AliZDCRecoParamPbPb();
         //
         TH2F* hZDCvsZEM = new TH2F("hZDCvsZEM","hZDCvsZEM",100,0.,10.,100,0.,1000.);
@@ -648,10 +640,18 @@ void AliZDCReconstructor::ReconstructEventpp(TTree *clustersTree, Float_t* corrA
   // ******	Equalization of detector responses
   Float_t equalTowZN1[10], equalTowZN2[10], equalTowZP1[10], equalTowZP2[10];
   for(Int_t gi=0; gi<10; gi++){
-     equalTowZN1[gi] = corrADCZN1[gi]*equalCoeffZN1[gi];
-     equalTowZP1[gi] = corrADCZP1[gi]*equalCoeffZP1[gi];
-     equalTowZN2[gi] = corrADCZN2[gi]*equalCoeffZN2[gi];
-     equalTowZP2[gi] = corrADCZP2[gi]*equalCoeffZP2[gi];
+     if(gi<5){
+       equalTowZN1[gi] = corrADCZN1[gi]*equalCoeffZN1[gi];
+       equalTowZP1[gi] = corrADCZP1[gi]*equalCoeffZP1[gi];
+       equalTowZN2[gi] = corrADCZN2[gi]*equalCoeffZN2[gi];
+       equalTowZP2[gi] = corrADCZP2[gi]*equalCoeffZP2[gi];
+     }
+     else{
+       equalTowZN1[gi] = corrADCZN1[gi]*equalCoeffZN1[gi-5];
+       equalTowZP1[gi] = corrADCZP1[gi]*equalCoeffZP1[gi-5];
+       equalTowZN2[gi] = corrADCZN2[gi]*equalCoeffZN2[gi-5];
+       equalTowZP2[gi] = corrADCZP2[gi]*equalCoeffZP2[gi-5];
+     }
   }
   
   // ******	Summed response for hadronic calorimeter (SUMMED and then CALIBRATED!)
@@ -777,10 +777,18 @@ void AliZDCReconstructor::ReconstructEventPbPb(TTree *clustersTree,
   // ******	Equalization of detector responses
   Float_t equalTowZN1[10], equalTowZN2[10], equalTowZP1[10], equalTowZP2[10];
   for(Int_t gi=0; gi<10; gi++){
-     equalTowZN1[gi] = corrADCZN1[gi]*equalCoeffZN1[gi];
-     equalTowZP1[gi] = corrADCZP1[gi]*equalCoeffZP1[gi];
-     equalTowZN2[gi] = corrADCZN2[gi]*equalCoeffZN2[gi];
-     equalTowZP2[gi] = corrADCZP2[gi]*equalCoeffZP2[gi];
+     if(gi<5){
+       equalTowZN1[gi] = corrADCZN1[gi]*equalCoeffZN1[gi];
+       equalTowZP1[gi] = corrADCZP1[gi]*equalCoeffZP1[gi];
+       equalTowZN2[gi] = corrADCZN2[gi]*equalCoeffZN2[gi];
+       equalTowZP2[gi] = corrADCZP2[gi]*equalCoeffZP2[gi];
+     }
+     else{
+       equalTowZN1[gi] = corrADCZN1[gi]*equalCoeffZN1[gi-5];
+       equalTowZP1[gi] = corrADCZP1[gi]*equalCoeffZP1[gi-5];
+       equalTowZN2[gi] = corrADCZN2[gi]*equalCoeffZN2[gi-5];
+       equalTowZP2[gi] = corrADCZP2[gi]*equalCoeffZP2[gi-5];
+     }
   }
   
   // ******	Summed response for hadronic calorimeter (SUMMED and then CALIBRATED!)