]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ZDC/AliZDCReconstructor.cxx
Some code cleanup
[u/mrichter/AliRoot.git] / ZDC / AliZDCReconstructor.cxx
index 7d651141406cbdbc25eda769125cb79e13516950..38982067b855dba45d0fecf2f129512679fe7c5b 100644 (file)
 #include "AliZDCRawStream.h"
 #include "AliZDCReco.h"
 #include "AliZDCReconstructor.h"
+#include "AliZDCCalibData.h"
 
 
 ClassImp(AliZDCReconstructor)
 
 
 //_____________________________________________________________________________
-AliZDCReconstructor:: AliZDCReconstructor()
-{
-// default constructor
-
-  //  ---      Number of generated spectator nucleons and impact parameter
-  // --------------------------------------------------------------------------------------------------
-  // [1] ### Results in Chiara's PhD thesis -> 0<b<15 fm (Dec 2001)
-  /*// Fit results for neutrons (Nspectator n true vs. EZN)
-  fZNCen = new TF1("fZNCen",
-      "(-2.116909+sqrt(2.116909*2.116909-4*(-0.00651)*(14.556798-x)))/(2*(-0.00651))",0.,158.5);
-  fZNPer = new TF1("fZNPer",
-      "(-34.695134-sqrt(34.695134*34.695134-4*(-0.174780)*(-1562.283443-x)))/(2*(-0.174780))",0.,158.5);
-  // Fit results for protons (Nspectator p true vs. EZP)
-  fZPCen = new TF1("fZPCen",
-      "(-1.3217+sqrt(1.3217*1.3217-4*(-0.007934)*(4.742873-x)))/(2*(-0.007934))",0.,58.91);
-  fZPPer = new TF1("fZPPer",
-      "(-15.788267-sqrt(15.788267*15.788267-4*(-0.133359)*(-383.800673-x)))/(2*(-0.133359))",0.,58.91);
-  // Fit results for total number of spectators (Nspectators true vs. EZDC)
-  fZDCCen = new TF1("fZDCCen",
-      "(-1.867335+sqrt(1.867335*1.867335-4*(-0.004119)*(19.100289-x)))/(2*(-0.004119))",0.,220.4);
-  fZDCPer = new TF1("fZDCPer",
-      "(-22.429097-sqrt(22.429097*22.429097-4*(-0.072435)*(-1482.034526-x)))/(2*(-0.072435))",0.,220.4);*/
-  // --------------------------------------------------------------------------------------------------
-  // [1] ### Results from a new production  -> 0<b<18 fm (Apr 2002)
-  // Fit results for neutrons (Nspectator n true vs. EZN)
-  fZNCen = new TF1("fZNCen",
-      "(-2.287920+sqrt(2.287920*2.287920-4*(-0.007629)*(11.921710-x)))/(2*(-0.007629))",0.,164.);
-  fZNPer = new TF1("fZNPer",
-      "(-37.812280-sqrt(37.812280*37.812280-4*(-0.190932)*(-1709.249672-x)))/(2*(-0.190932))",0.,164.);
-  // Fit results for protons (Nspectator p true vs. EZP)
-  fZPCen = new TF1("fZPCen",
-       "(-1.321353+sqrt(1.321353*1.321353-4*(-0.007283)*(3.550697-x)))/(2*(-0.007283))",0.,60.);
-  fZPPer = new TF1("fZPPer",
-      "(-42.643308-sqrt(42.643308*42.643308-4*(-0.310786)*(-1402.945615-x)))/(2*(-0.310786))",0.,60.);
-  // Fit results for total number of spectators (Nspectators true vs. EZDC)
-  fZDCCen = new TF1("fZDCCen",
-      "(-1.934991+sqrt(1.934991*1.934991-4*(-0.004080)*(15.111124-x)))/(2*(-0.004080))",0.,225.);
-  fZDCPer = new TF1("fZDCPer",
-      "(-34.380639-sqrt(34.380639*34.380639-4*(-0.104251)*(-2612.189017-x)))/(2*(-0.104251))",0.,225.);
-  // --------------------------------------------------------------------------------------------------
-  // [1] ### Results in Chiara's PhD thesis -> 0<b<15 fm (Dec 2001)
-  /*// Fit results for b (b vs. EZDC)
-  //fbCen = new TF1("fbCen","0.611543+0.052231*x-0.000112*x*x+0.000000374*x*x*x",0.,222.);
-  //fbPer = new TF1("fbPer","16.552010-0.023866*x-0.00001*x*x",0.,222.);
-  fbCen = new TF1("fbCen","0.612769+0.051929*x-0.0001074*x*x+0.0000003724*x*x*x",0.,225.);
-  fbPer = new TF1("fbPer","16.6131016-0.026053*x+0.000006893*x*x",0.,225.);*/
-  // --------------------------------------------------------------------------------------------------
-  // [2] ### Results from a new production  -> 0<b<18 fm (Apr 2002)
-  fbCen = new TF1("fbCen","-0.056923+0.079703*x-0.0004301*x*x+0.000001366*x*x*x",0.,220.);
-  fbPer = new TF1("fbPer","17.943998-0.046846*x+0.000074*x*x",0.,220.);
-  // --------------------------------------------------------------------------------------------------
-  // Evaluating Nspectators and b from ZEM energy
-  // [1] ### Results in Chiara's PhD thesis -> 0<b<15 fm (Dec 2001)
-  /*fZEMn  = new TF1("fZEMn","124.2-0.0566*x+0.000006014*x*x",0.,3500.);
-  fZEMp  = new TF1("fZEMp","81.3-0.03834*x+0.000004359*x*x",0.,3500.);
-  fZEMsp = new TF1("fZEMsp","205.6-0.09567*x+0.00001056*x*x",0.,3500.);
-  fZEMb  = new TF1("fZEMb","15.8-0.02084*x+2.802e-5*x*x-2.007e-8*x*x*x+6.586e-12*x*x*x*x-8.042e-16*x*x*x*x*x",0.,3500.);*/
-  // --------------------------------------------------------------------------------------------------
-  // [2] ### Results from a new production  -> 0<b<18 fm (Apr 2002)
-  fZEMn  = new TF1("fZEMn","126.2-0.05399*x+0.000005679*x*x",0.,4000.);
-  fZEMp  = new TF1("fZEMp","82.49-0.03611*x+0.00000385*x*x",0.,4000.);
-  fZEMsp = new TF1("fZEMsp","208.7-0.09006*x+0.000009526*x*x",0.,4000.);
-  fZEMb  = new TF1("fZEMb","16.06-0.01633*x+1.44e-5*x*x-6.778e-9*x*x*x+1.438e-12*x*x*x*x-1.112e-16*x*x*x*x*x",0.,4000.);
-}
+AliZDCReconstructor:: AliZDCReconstructor() :
+
+  fZNCen (new TF1("fZNCen", 
+       "(-2.287920+sqrt(2.287920*2.287920-4*(-0.007629)*(11.921710-x)))/(2*(-0.007629))",0.,164.)),
+  fZNPer (new TF1("fZNPer",
+      "(-37.812280-sqrt(37.812280*37.812280-4*(-0.190932)*(-1709.249672-x)))/(2*(-0.190932))",0.,164.)),
+  fZPCen (new TF1("fZPCen",
+       "(-1.321353+sqrt(1.321353*1.321353-4*(-0.007283)*(3.550697-x)))/(2*(-0.007283))",0.,60.)),
+  fZPPer (new TF1("fZPPer",
+      "(-42.643308-sqrt(42.643308*42.643308-4*(-0.310786)*(-1402.945615-x)))/(2*(-0.310786))",0.,60.)),
+  fZDCCen (new TF1("fZDCCen",
+      "(-1.934991+sqrt(1.934991*1.934991-4*(-0.004080)*(15.111124-x)))/(2*(-0.004080))",0.,225.)),
+  fZDCPer (new TF1("fZDCPer",
+      "(-34.380639-sqrt(34.380639*34.380639-4*(-0.104251)*(-2612.189017-x)))/(2*(-0.104251))",0.,225.)),
+  fbCen (new TF1("fbCen","-0.056923+0.079703*x-0.0004301*x*x+0.000001366*x*x*x",0.,220.)),
+  fbPer (new TF1("fbPer","17.943998-0.046846*x+0.000074*x*x",0.,220.)),
+  fZEMn (new TF1("fZEMn","126.2-0.05399*x+0.000005679*x*x",0.,4000.)),
+  fZEMp (new TF1("fZEMp","82.49-0.03611*x+0.00000385*x*x",0.,4000.)),
+  fZEMsp (new TF1("fZEMsp","208.7-0.09006*x+0.000009526*x*x",0.,4000.)),
+  fZEMb (new TF1("fZEMb",
+       "16.06-0.01633*x+1.44e-5*x*x-6.778e-9*x*x*x+1.438e-12*x*x*x*x-1.112e-16*x*x*x*x*x",0.,4000.)),
+  fCalibData(GetCalibData())
 
-//_____________________________________________________________________________
-AliZDCReconstructor::AliZDCReconstructor(const AliZDCReconstructor& 
-                                         reconstructor):
-  AliReconstructor(reconstructor)
 {
-// copy constructor
+  // **** Default constructor
 
-  Fatal("AliZDCReconstructor", "copy constructor not implemented");
 }
 
-//_____________________________________________________________________________
-AliZDCReconstructor& AliZDCReconstructor::operator = 
-  (const AliZDCReconstructor& /*reconstructor*/)
-{
-// assignment operator
-
-  Fatal("operator =", "assignment operator not implemented");
-  return *this;
-}
 
 //_____________________________________________________________________________
 AliZDCReconstructor::~AliZDCReconstructor()
@@ -145,7 +90,10 @@ AliZDCReconstructor::~AliZDCReconstructor()
 //_____________________________________________________________________________
 void AliZDCReconstructor::Reconstruct(AliRunLoader* runLoader) const
 {
-// local ZDC reconstruction
+  // *** Local ZDC reconstruction for digits
+    
+  Float_t meanPed[47];
+  for(Int_t jj=0; jj<47; jj++) meanPed[jj] = fCalibData->GetMeanPed(jj);
 
   AliLoader* loader = runLoader->GetLoader("ZDCLoader");
   if (!loader) return;
@@ -165,18 +113,35 @@ void AliZDCReconstructor::Reconstruct(AliRunLoader* runLoader) const
     treeD->SetBranchAddress("ZDC", &pdigit);
 
     // loop over digits
-    Int_t znraw=0, zpraw=0, zemraw=0;
+    Float_t zn1corr=0, zp1corr=0, zn2corr=0, zp2corr=0, zemcorr=0;
     for (Int_t iDigit = 0; iDigit < treeD->GetEntries(); iDigit++) {
       treeD->GetEntry(iDigit);
       if (!pdigit) continue;
 
-      if(digit.GetSector(0) == 1)      znraw  += digit.GetADCValue(0);
-      else if(digit.GetSector(0) == 2)         zpraw  += digit.GetADCValue(0);
-      else if(digit.GetSector(0) == 3)         zemraw += digit.GetADCValue(0);
+      if(digit.GetSector(0) == 1)
+                zn1corr  += (Float_t) (digit.GetADCValue(0)-meanPed[digit.GetSector(1)]);     // high gain ZN1 ADCs
+      else if(digit.GetSector(0) == 2)
+        zp1corr  += (Float_t) (digit.GetADCValue(0)-meanPed[digit.GetSector(1)+10]);  // high gain ZP1 ADCs
+      else if(digit.GetSector(0) == 3){
+        if(digit.GetSector(1)==1)      
+          zemcorr += (Float_t) (digit.GetADCValue(0)-meanPed[digit.GetSector(1)+20]); // high gain ZEM1 ADCs
+        else if(digit.GetSector(1)==2) 
+          zemcorr += (Float_t) (digit.GetADCValue(0)-meanPed[digit.GetSector(1)+22]); // high gain ZEM2 ADCs
+      }
+      else if(digit.GetSector(0) == 4)
+                zn2corr  += (Float_t) (digit.GetADCValue(0)-meanPed[digit.GetSector(1)+24]);  // high gain ZN2 ADCs
+      else if(digit.GetSector(0) == 5)
+        zp2corr  += (Float_t) (digit.GetADCValue(0)-meanPed[digit.GetSector(1)+34]);  // high gain ZP2 ADCs
     }
+    if(zn1corr<0)  zn1corr=0;
+    if(zp1corr<0)  zp1corr=0;
+    if(zn2corr<0)  zn2corr=0;
+    if(zp2corr<0)  zp2corr=0;
+    if(zemcorr<0)  zemcorr=0;
 
     // reconstruct the event
-    ReconstructEvent(loader, znraw, zpraw, zemraw);
+    //printf("\n \t ZDCReco from digits-> Ev.#%d ZN = %.0f, ZP = %.0f, ZEM = %.0f\n",iEvent,zncorr,zpcorr,zemcorr);
+    ReconstructEvent(loader, zn1corr, zp1corr, zemcorr, zn2corr, zp2corr);
   }
 
   loader->UnloadDigits();
@@ -187,7 +152,10 @@ void AliZDCReconstructor::Reconstruct(AliRunLoader* runLoader) const
 void AliZDCReconstructor::Reconstruct(AliRunLoader* runLoader, 
                                       AliRawReader* rawReader) const
 {
-// local ZDC reconstruction for raw data
+  // *** Local ZDC reconstruction for raw data
+  
+  Float_t meanPed[47];
+  for(Int_t jj=0; jj<47; jj++) meanPed[jj] = fCalibData->GetMeanPed(jj);
 
   AliLoader* loader = runLoader->GetLoader("ZDCLoader");
   if (!loader) return;
@@ -198,51 +166,57 @@ void AliZDCReconstructor::Reconstruct(AliRunLoader* runLoader,
     runLoader->GetEvent(iEvent++);
 
     // loop over raw data digits
-    Int_t znraw=0, zpraw=0, zemraw=0;
+    Float_t zn1corr=0, zp1corr=0,  zn2corr=0, zp2corr=0,zemcorr=0;
     AliZDCRawStream digit(rawReader);
     while (digit.Next()) {
       if(digit.IsADCDataWord()){
         if(digit.GetADCGain() == 0){
-          printf("ADC value = %d\n",digit.GetADCValue());
-          if(digit.GetSector(0) == 1)     znraw  += digit.GetADCValue();
-          else if(digit.GetSector(0) == 2) zpraw  += digit.GetADCValue();
-          else if(digit.GetSector(0) == 3) zemraw += digit.GetADCValue();
-        }
+          if(digit.GetSector(0) == 1)     
+           zn1corr  += (Float_t) (digit.GetADCValue()-meanPed[digit.GetSector(1)]); // high gain ZN1 ADCs;
+          else if(digit.GetSector(0) == 2) 
+           zp1corr  += (Float_t) (digit.GetADCValue()-meanPed[digit.GetSector(1)+10]); // high gain ZP1 ADCs;
+          else if(digit.GetSector(0) == 3) 
+           if(digit.GetSector(1)==1)      
+             zemcorr += (Float_t) (digit.GetADCValue()-meanPed[digit.GetSector(1)+20]); // high gain ZEM1 ADCs
+           else if(digit.GetSector(1)==2) 
+             zemcorr += (Float_t) (digit.GetADCValue()-meanPed[digit.GetSector(1)+22]); // high gain ZEM2 ADCs
+          else if(digit.GetSector(0) == 4)        
+           zn2corr  += (Float_t) (digit.GetADCValue()-meanPed[digit.GetSector(1)+24]); // high gain ZN2 ADCs;
+          else if(digit.GetSector(0) == 5) 
+           zp2corr  += (Float_t) (digit.GetADCValue()-meanPed[digit.GetSector(1)+34]); // high gain ZP2 ADCs;
+       }
       }
     }
+    if(zn1corr<0) zn1corr=0;
+    if(zp1corr<0) zp1corr=0;
+    if(zn2corr<0) zn2corr=0;
+    if(zp2corr<0) zp2corr=0;
+    if(zemcorr<0) zemcorr=0;
+    
     // reconstruct the event
-    ReconstructEvent(loader, znraw, zpraw, zemraw);
+    //printf("\n\t ZDCReco from raw-> Ev.#%d ZN = %.0f, ZP = %.0f, ZEM = %.0f\n",iEvent,zncorr,zpcorr,zemcorr);
+    ReconstructEvent(loader, zn1corr, zp1corr, zemcorr, zn2corr, zp2corr);
   }
 
   loader->UnloadRecPoints();
 }
 
 //_____________________________________________________________________________
-void AliZDCReconstructor::ReconstructEvent(AliLoader* loader, Int_t znraw,
-                                           Int_t zpraw, Int_t zemraw) const
+void AliZDCReconstructor::ReconstructEvent(AliLoader* loader, Float_t zn1corr, 
+       Float_t zp1corr, Float_t zemcorr, Float_t zn2corr, Float_t zp2corr) const
 {
-// reconstruct one event
-
-//  if AliDebug(1,Form("\n     ---     znraw = %d, zpraw = %d, zemraw = %d\n",znraw, zpraw, zemraw);
-    
-  //  ---      Pedestal subtraction
-  Int_t zncorr, zpcorr, zemcorr, meanPed=50;
-  zncorr  = znraw  - 5*meanPed;
-  zpcorr  = zpraw  - 5*meanPed;
-  zemcorr = zemraw - 2*meanPed;
-  if(zncorr<0)  zncorr=0;
-  if(zpcorr<0)  zpcorr=0;
-  if(zemcorr<0) zemcorr=0;
-//  if AliDebug(1,Form("\n    zncorr = %d, zpcorr = %d, zemcorr = %d\n",zncorr,zpcorr,zemcorr);
+  // ***** Reconstruct one event
   
   //  ---      ADCchannel -> photoelectrons
   // NB-> PM gain = 10^(5), ADC resolution = 6.4*10^(-7)
   // Move to V965 (E.S.,15/09/04) NB-> PM gain = 10^(5), ADC resolution = 8*10^(-7)
-  Float_t znphe, zpphe, zemphe, convFactor = 0.08;
-  znphe  = zncorr/convFactor;
-  zpphe  = zpcorr/convFactor;
+  Float_t zn1phe, zp1phe, zemphe, zn2phe, zp2phe, convFactor = 0.08;
+  zn1phe  = zn1corr/convFactor;
+  zp1phe  = zp1corr/convFactor;
   zemphe = zemcorr/convFactor;
-//  if AliDebug(1,Form("\n    znphe = %f, zpphe = %f, zemphe = %f\n",znphe, zpphe, zemphe);
+  zn2phe  = zn2corr/convFactor;
+  zp2phe  = zp2corr/convFactor;
+  //if AliDebug(1,Form("\n    znphe = %f, zpphe = %f, zemphe = %f\n",znphe, zpphe, zemphe);
   
   //  ---      Energy calibration
   // Conversion factors for hadronic ZDCs goes from phe yield to TRUE 
@@ -252,69 +226,63 @@ void AliZDCReconstructor::ReconstructEvent(AliLoader* loader, Int_t znraw,
   // spectators have all the same energy, ZEM energy is obtained through a
   // fit over the whole range of incident particle energies 
   // (obtained with full HIJING simulations) 
-  Float_t znenergy, zpenergy, zemenergy, zdcenergy;
-  Float_t znphexTeV=329., zpphexTeV=369.;
-  znenergy  = znphe/znphexTeV;
-  zpenergy  = zpphe/zpphexTeV;
-  zdcenergy = znenergy+zpenergy;
+  Float_t zn1energy, zp1energy, zemenergy, zdc1energy, zn2energy, zp2energy, zdc2energy;
+  Float_t zn1phexTeV=329., zp1phexTeV=369., zn2phexTeV=329., zp2phexTeV=369.;
+  zn1energy  = zn1phe/zn1phexTeV;
+  zp1energy  = zp1phe/zp1phexTeV;
+  zdc1energy = zn1energy+zp1energy;
+  zn2energy  = zn2phe/zn2phexTeV;
+  zp2energy  = zp2phe/zp2phexTeV;
+  zdc2energy = zn2energy+zp2energy;
   zemenergy = -4.81+0.3238*zemphe;
   if(zemenergy<0) zemenergy=0;
-//  if AliDebug(1,Form("    znenergy = %f TeV, zpenergy = %f TeV, zdcenergy = %f GeV, "
-//                        "\n          zemenergy = %f TeV\n", znenergy, zpenergy, 
-//                        zdcenergy, zemenergy);
-  
-//  if(zdcenergy==0)
-//    if AliDebug(1,Form("\n\n ###     ATTENZIONE!!! -> ev# %d: znenergy = %f TeV, zpenergy = %f TeV, zdcenergy = %f GeV, "
-//                          " zemenergy = %f TeV\n\n", fMerger->EvNum(), znenergy, zpenergy, zdcenergy, zemenergy); 
-
-  //  ---      Number of incident spectator nucleons
-  Int_t nDetSpecN, nDetSpecP;
-  nDetSpecN = (Int_t) (znenergy/2.760);
-  nDetSpecP = (Int_t) (zpenergy/2.760);
-//  if AliDebug(1,Form("\n    nDetSpecN = %d, nDetSpecP = %d\n",nDetSpecN, nDetSpecP);
-
-  Int_t nGenSpecN=0, nGenSpecP=0, nGenSpec=0;
+  //  if AliDebug(1,Form("    znenergy = %f TeV, zpenergy = %f TeV, zdcenergy = %f GeV, "
+  //                      "\n          zemenergy = %f TeV\n", znenergy, zpenergy, 
+  //                      zdcenergy, zemenergy);
+  //  if(zdcenergy==0)
+  //    if AliDebug(1,Form("\n\n       ###     ATTENZIONE!!! -> ev# %d: znenergy = %f TeV, zpenergy = %f TeV, zdcenergy = %f GeV, "
+  //                        " zemenergy = %f TeV\n\n", fMerger->EvNum(), znenergy, zpenergy, zdcenergy, zemenergy); 
+
+  //  ---      Number of detected spectator nucleons
+  //  *** N.B. -> It works only in Pb-Pb
+  Int_t nDetSpecNLeft, nDetSpecPLeft, nDetSpecNRight, nDetSpecPRight;
+  nDetSpecNLeft = (Int_t) (zn1energy/2.760);
+  nDetSpecPLeft = (Int_t) (zp1energy/2.760);
+  nDetSpecNRight = (Int_t) (zn2energy/2.760);
+  nDetSpecPRight = (Int_t) (zp2energy/2.760);
+
+  //  ---      Number of generated spectator nucleons (from HIJING parameterization)
+   //  *** N.B. -> Only one side!!!
+ Int_t nGenSpecN=0, nGenSpecP=0, nGenSpec=0;
   Double_t impPar=0;
   // Cut value for Ezem (GeV)
-  // [1] ### Results in Chiara's PhD thesis -> 0<b<15 fm (Dec 2001)
-  //Float_t eZEMCut = 360.; 
-  // [2] ### Results from a new production  -> 0<b<18 fm (Apr 2002)
+  // ### Results from production  -> 0<b<18 fm (Apr 2002)
   Float_t eZEMCut = 420.;
   Float_t deltaEZEMSup = 690.; 
   Float_t deltaEZEMInf = 270.; 
   if(zemenergy > (eZEMCut+deltaEZEMSup)){
-    nGenSpecN = (Int_t) (fZNCen->Eval(znenergy));
-    nGenSpecP = (Int_t) (fZPCen->Eval(zpenergy));
-    nGenSpec  = (Int_t) (fZDCCen->Eval(zdcenergy));
-    impPar    = fbCen->Eval(zdcenergy);
-    //printf("    fZNCen = %f, fZPCen = %f, fZDCCen = %f\n",fZNCen->Eval(znenergy),
-    //            fZPCen->Eval(zpenergy),fZDCCen->Eval(zdcenergy));
+    nGenSpecN = (Int_t) (fZNCen->Eval(zn1energy));
+    nGenSpecP = (Int_t) (fZPCen->Eval(zp1energy));
+    nGenSpec  = (Int_t) (fZDCCen->Eval(zdc1energy));
+    impPar    = fbCen->Eval(zdc1energy);
   }
   else if(zemenergy < (eZEMCut-deltaEZEMInf)){
-    nGenSpecN = (Int_t) (fZNPer->Eval(znenergy)); 
-    nGenSpecP = (Int_t) (fZPPer->Eval(zpenergy));
-    nGenSpec  = (Int_t) (fZDCPer->Eval(zdcenergy));
-    impPar    = fbPer->Eval(zdcenergy);
-    //printf("    fZNPer = %f, fZPPer = %f, fZDCPer = %f\n",fZNPer->Eval(znenergy),
-    //            fZPPer->Eval(zpenergy),fZDCPer->Eval(zdcenergy));
+    nGenSpecN = (Int_t) (fZNPer->Eval(zn1energy)); 
+    nGenSpecP = (Int_t) (fZPPer->Eval(zp1energy));
+    nGenSpec  = (Int_t) (fZDCPer->Eval(zdc1energy));
+    impPar    = fbPer->Eval(zdc1energy);
   }
   else if(zemenergy >= (eZEMCut-deltaEZEMInf) && zemenergy <= (eZEMCut+deltaEZEMSup)){
     nGenSpecN = (Int_t) (fZEMn->Eval(zemenergy));
     nGenSpecP = (Int_t) (fZEMp->Eval(zemenergy));
     nGenSpec  = (Int_t)(fZEMsp->Eval(zemenergy));
     impPar    =  fZEMb->Eval(zemenergy);
-    //printf("    Nspec ZEM = %f, Nspec ZDC = %f\n",fZEMsp->Eval(znenergy),fZDCPer->Eval(zdcenergy));
   }
-  // [1] ### Results in Chiara's PhD thesis -> 0<b<15 fm (Dec 2001)
-  /*if(znenergy>158.5)  nGenSpecN = (Int_t) (fZEMn->Eval(zemenergy));
-    if(zpenergy>58.91)  nGenSpecP = (Int_t) (fZEMp->Eval(zemenergy));
-    if(zdcenergy>220.4) nGenSpec  = (Int_t)(fZEMsp->Eval(zemenergy));
-    if(zdcenergy>225.)  impPar    =          fZEMb->Eval(zemenergy);*/
-  // [2] ### Results from a new production  -> 0<b<18 fm (Apr 2002)
-  if(znenergy>162.)  nGenSpecN = (Int_t) (fZEMn->Eval(zemenergy));
-  if(zpenergy>59.75)  nGenSpecP = (Int_t) (fZEMp->Eval(zemenergy));
-  if(zdcenergy>221.5) nGenSpec  = (Int_t)(fZEMsp->Eval(zemenergy));
-  if(zdcenergy>220.)  impPar    =  fZEMb->Eval(zemenergy);
+  // ### Results from production  -> 0<b<18 fm (Apr 2002)
+  if(zn1energy>162.)  nGenSpecN = (Int_t) (fZEMn->Eval(zemenergy));
+  if(zp1energy>59.75)  nGenSpecP = (Int_t) (fZEMp->Eval(zemenergy));
+  if(zdc1energy>221.5) nGenSpec  = (Int_t)(fZEMsp->Eval(zemenergy));
+  if(zdc1energy>220.)  impPar    =  fZEMb->Eval(zemenergy);
   
   if(nGenSpecN>125)    nGenSpecN=125;
   else if(nGenSpecN<0) nGenSpecN=0;
@@ -322,21 +290,21 @@ void AliZDCReconstructor::ReconstructEvent(AliLoader* loader, Int_t znraw,
   else if(nGenSpecP<0) nGenSpecP=0;
   if(nGenSpec>207)     nGenSpec=207;
   else if(nGenSpec<0)  nGenSpec=0;
-  //printf("    NRecSpecN = %d, NRecSpecP = %d, NRecSpec = %d\n",nGenSpecN,nGenSpecP,nGenSpec);
   
-  //  ---      Number of participants
+  //  ---      Number of generated participants (from HIJING parameterization)
   Int_t nPart, nPartTot;
   nPart = 207-nGenSpecN-nGenSpecP;
   nPartTot = 207-nGenSpec;
-  //printf("   ###     nPart(ZP+ZN) = %d, nPart(ZDC) = %d, b = %f fm\n",nPart,nPartTot,impPar);
-//  if AliDebug(1,Form("       ###     nPart = %d, b = %f fm\n",nPartTot,impPar);
+  //printf("\t  ZDCeventReco-> ZNEn = %.0f GeV, ZPEn = %.0f GeV, ZEMEn = %.0f GeV\n",
+  //   znenergy, zpenergy, zemenergy);
 
   // create the output tree
   loader->MakeTree("R");
   TTree* treeR = loader->TreeR();
-  AliZDCReco reco(znenergy, zpenergy, zdcenergy, zemenergy,
-                  nDetSpecN, nDetSpecP, nGenSpecN, nGenSpecP, nGenSpec,
-                  nPartTot, impPar);
+  AliZDCReco reco(zn1energy, zp1energy, zdc1energy, zemenergy,
+                 zn2energy, zp2energy, zdc2energy, 
+                  nDetSpecNLeft, nDetSpecPLeft, nDetSpecNRight, nDetSpecPRight,
+                 nGenSpecN, nGenSpecP, nGenSpec,nPartTot, impPar);
   AliZDCReco* preco = &reco;
   const Int_t kBufferSize = 4000;
   treeR->Branch("ZDC", "AliZDCReco", &preco, kBufferSize);
@@ -363,8 +331,49 @@ void AliZDCReconstructor::FillESD(AliRunLoader* runLoader,
   treeR->SetBranchAddress("ZDC", &preco);
 
   treeR->GetEntry(0);
-  esd->SetZDC(reco.GetZNenergy(), reco.GetZPenergy(), reco.GetZEMenergy(),
-             reco.GetNPart());
+  esd->SetZDC(reco.GetZN1energy(), reco.GetZP1energy(), reco.GetZEMenergy(),
+             reco.GetZN2energy(), reco.GetZP2energy(), reco.GetNPart());
 
   loader->UnloadRecPoints();
 }
+
+//_____________________________________________________________________________
+AliCDBStorage* AliZDCReconstructor::SetStorage(const char *uri) 
+{
+  // Setting the storage
+
+  Bool_t deleteManager = kFALSE;
+  
+  AliCDBManager *manager = AliCDBManager::Instance();
+  AliCDBStorage *defstorage = manager->GetDefaultStorage();
+  
+  if(!defstorage || !(defstorage->Contains("ZDC"))){ 
+     AliWarning("No default storage set or default storage doesn't contain ZDC!");
+     manager->SetDefaultStorage(uri);
+     deleteManager = kTRUE;
+  }
+  AliCDBStorage *storage = manager->GetDefaultStorage();
+
+  if(deleteManager){
+    AliCDBManager::Instance()->UnsetDefaultStorage();
+    defstorage = 0;   // the storage is killed by AliCDBManager::Instance()->Destroy()
+  }
+
+  return storage; 
+}
+
+//_____________________________________________________________________________
+AliZDCCalibData* AliZDCReconstructor::GetCalibData() const
+{
+
+  // Getting calibration object for ZDC set
+
+  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/Data");
+  if(!entry) AliFatal("No calibration data loaded!");  
+
+  AliZDCCalibData *calibdata = dynamic_cast<AliZDCCalibData*>  (entry->GetObject());
+  if(!calibdata)  AliFatal("Wrong calibration object in calibration  file!");
+
+  return calibdata;
+}