UPdated code - AliZDCMBCalib object initialized ONLY in A-A reco

diff --git a/ZDC/AliZDCReconstructor.cxx b/ZDC/AliZDCReconstructor.cxx
index 2e7efe34376ef9d7935858ce556558ea1d4bef50..5ecede6e2a6d5b04893445f1b94d66e12f75f8da 100644 (file)
--- a/ZDC/AliZDCReconstructor.cxx
+++ b/ZDC/AliZDCReconstructor.cxx
@@ -51,13 +51,13 @@
 
 ClassImp(AliZDCReconstructor)
 AliZDCRecoParam *AliZDCReconstructor::fRecoParam=0;  //reconstruction parameters
+AliZDCMBCalib *AliZDCReconstructor::fMBCalibData=0;  //calibration parameters for A-A reconstruction
 
 //_____________________________________________________________________________
 AliZDCReconstructor:: AliZDCReconstructor() :
   fPedData(GetPedestalData()),
   fEnCalibData(GetEnergyCalibData()),
   fTowCalibData(GetTowerCalibData()),
-  fMBCalibData(GetMBCalibData()),
   fRecoMode(0),
   fBeamEnergy(0.),
   fNRun(0),
@@ -271,7 +271,7 @@ void AliZDCReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) co
     ReconstructEventPbPb(clustersTree, tZN1Corr, tZP1Corr, tZN2Corr, tZP2Corr, 
       dZEM1Corr, dZEM2Corr, sPMRef1, sPMRef2, 
       kFALSE, counts, 
-      evQualityBlock,  triggerBlock,  chBlock, puBits);
+      evQualityBlock,  triggerBlock,  chBlock, puBits);    
 }
 
 //_____________________________________________________________________________
@@ -564,7 +564,7 @@ void AliZDCReconstructor::Reconstruct(AliRawReader* rawReader, TTree* clustersTr
       isScalerOn, scalerData, 
       evQualityBlock, triggerBlock, chBlock, puBits);
   else if(fRecoMode==2) // Pb-Pb data
-    ReconstructEventPbPb(clustersTree, tZN1Corr, tZP1Corr, tZN2Corr, tZP2Corr, 
+      ReconstructEventPbPb(clustersTree, tZN1Corr, tZP1Corr, tZN2Corr, tZP2Corr, 
       dZEM1Corr, dZEM2Corr, sPMRef1, sPMRef2, 
       isScalerOn, scalerData, 
       evQualityBlock, triggerBlock, chBlock, puBits);
@@ -919,6 +919,7 @@ void AliZDCReconstructor::ReconstructEventPbPb(TTree *clustersTree,
   if(fIsCalibrationMB == kFALSE){
     // ******  Reconstruction parameters ------------------ 
     if (!fRecoParam) fRecoParam = const_cast<AliZDCRecoParam*>(GetRecoParam()); 
+    if(!fMBCalibData) fMBCalibData = const_cast<AliZDCMBCalib*>(GetMBCalibData()); 
  
     TH2F *hZDCvsZEM  = fMBCalibData->GethZDCvsZEM();
     TH2F *hZDCCvsZEM = fMBCalibData->GethZDCCvsZEM();

diff --git a/ZDC/AliZDCReconstructor.h b/ZDC/AliZDCReconstructor.h
index d281f98a356c3e04a79dda607702631b02818f2c..513eec04cda61afc0fc19f64fcdb5a62d3ceccaf 100644 (file)
--- a/ZDC/AliZDCReconstructor.h
+++ b/ZDC/AliZDCReconstructor.h
@@ -85,10 +85,10 @@ private:
 
   static AliZDCRecoParam *fRecoParam; // reconstruction parameters
 
-  AliZDCPedestals  *fPedData;      //! pedestal calibration data
-  AliZDCEnCalib    *fEnCalibData;   //! energy calibration data
-  AliZDCTowerCalib *fTowCalibData;  //! equalization calibration data
-  AliZDCMBCalib    *fMBCalibData;   //! mb calibration data
+  static AliZDCMBCalib   *fMBCalibData;   //! mb calibration data
+  AliZDCPedestals  *fPedData;            //! pedestal calibration data
+  AliZDCEnCalib    *fEnCalibData;        //! energy calibration data
+  AliZDCTowerCalib *fTowCalibData;       //! equalization calibration data
   
   Int_t   fRecoMode;       // =1->p-p, =2->A-A
   Float_t fBeamEnergy;     // beam energy