Updated class version

diff --git a/ZDC/AliZDCCalibData.cxx b/ZDC/AliZDCCalibData.cxx
index f3a3a2f56a55bf1c21ded0f39b88341591571bea..301b32f634efb97ee336b2ddce3df599f1e24899 100644 (file)
--- a/ZDC/AliZDCCalibData.cxx
+++ b/ZDC/AliZDCCalibData.cxx
@@ -63,7 +63,9 @@ AliZDCCalibData::AliZDCCalibData(const AliZDCCalibData& calibda) :
      fPedCorrCoeff[1][t] = calibda.GetPedCorrCoeff1(t);
   }
   for(int t=0; t<6; t++)  fEnCalibration[t] = calibda.GetEnCalib(t);
-//  PrepHistos();
+  //
+  fEZEMEndValue    = calibda.GetEZEMEndValue();   
+  fEZEMCutFraction = calibda.GetEZEMCutFraction();
 }
 
 //________________________________________________________________
@@ -84,7 +86,9 @@ AliZDCCalibData &AliZDCCalibData::operator =(const AliZDCCalibData& calibda)
      fPedCorrCoeff[1][t] = calibda.GetPedCorrCoeff1(t);
   }
   for(int t=0; t<6; t++) fEnCalibration[t] = calibda.GetEnCalib(t);
-//  PrepHistos();
+  fEZEMEndValue    = calibda.GetEZEMEndValue();
+  fEZEMCutFraction = calibda.GetEZEMCutFraction();
+
   return *this;
 }
 
@@ -138,7 +142,7 @@ void  AliZDCCalibData::Print(Option_t *) const
      else if(t==21) printf("\n-------- ZEM1 LowRes --------  \n");
      else if(t==22) printf("\n-------- ZEM2 HighRes --------  \n");
      else if(t==23) printf("\n-------- ZEM2 LowRes --------  \n");
-     printf("ADC%d (%.1f, %.1f)\t",t,fMeanPedestal[t],fMeanPedWidth[t]);
+     printf("ADC%d (%.1f, %.1f)  ",t,fMeanPedestal[t],fMeanPedWidth[t]);
    }
    //
    printf("\n\n\n #######      Out-of-time pedestal values (mean value, sigma) ####### \n");
@@ -151,7 +155,7 @@ void  AliZDCCalibData::Print(Option_t *) const
      else if(t==21) printf("\n-------- ZEM1 LowRes --------  \n");
      else if(t==22) printf("\n-------- ZEM2 HighRes --------  \n");
      else if(t==23) printf("\n-------- ZEM2 LowRes --------  \n");
-     printf("ADC%d (%.1f, %.1f)\t",t,fOOTPedestal[t],fOOTPedWidth[t]);
+     printf("ADC%d (%.1f, %.1f)  ",t,fOOTPedestal[t],fOOTPedWidth[t]);
    }
  
    printf("\n\n\n #######      Energy calibration coefficients ####### \n");
@@ -161,6 +165,16 @@ void  AliZDCCalibData::Print(Option_t *) const
    printf("  ZP2 = %.4f (E[TeV]/ADCch.) \n",fEnCalibration[3]);
    printf("  ZEM1 = %.2f (E[TeV]/ADCch.) \n",fEnCalibration[4]);
    printf("  ZEM2 = %.2f (E[TeV]/ADCch.) \n",fEnCalibration[5]);
+ 
+   printf("\n\n\n #######      Equalization coefficients #######       \n");
+   printf("  ZN1 -> %1.2f %1.2f %1.2f %1.2f %1.2f  \n",
+    fZN1EqualCoeff[0],fZN1EqualCoeff[1],fZN1EqualCoeff[2],fZN1EqualCoeff[3],fZN1EqualCoeff[4]);
+   printf("  ZP1 -> %1.2f %1.2f %1.2f %1.2f %1.2f  \n",
+    fZP1EqualCoeff[0],fZP1EqualCoeff[1],fZP1EqualCoeff[2],fZP1EqualCoeff[3],fZP1EqualCoeff[4]);
+   printf("  ZN2 -> %1.2f %1.2f %1.2f %1.2f %1.2f  \n",
+    fZN2EqualCoeff[0],fZN2EqualCoeff[1],fZN2EqualCoeff[2],fZN2EqualCoeff[3],fZN2EqualCoeff[4]);
+   printf("  ZP2 -> %1.2f %1.2f %1.2f %1.2f %1.2f  \n\n",
+    fZP2EqualCoeff[0],fZP2EqualCoeff[1],fZP2EqualCoeff[2],fZP2EqualCoeff[3],fZP2EqualCoeff[4]);
 } 
 
 //________________________________________________________________

diff --git a/ZDC/AliZDCCalibData.h b/ZDC/AliZDCCalibData.h
index 510bb7eb4eaf3cf0ac4697438fdd314747775c0b..6e4c4f2e7146eb8d73c8e21038e6c2f2d604dd95 100644 (file)
--- a/ZDC/AliZDCCalibData.h
+++ b/ZDC/AliZDCCalibData.h
@@ -80,6 +80,11 @@ class AliZDCCalibData: public TNamed {
   void         SetZN2EqualCoeff(Float_t* EqualCoeff);
   void         SetZP2EqualCoeff(Int_t channel, Float_t val) {fZP2EqualCoeff[channel]=val;}
   void         SetZP2EqualCoeff(Float_t* EqualCoeff);
+  //  
+  void    SetEZEMEndValue(Float_t EZEMEndValue) {fEZEMEndValue = EZEMEndValue;}
+  void    SetEZEMCutFraction(Float_t EZEMCutFraction) {fEZEMCutFraction = EZEMCutFraction;}
+  virtual Float_t GetEZEMEndValue()     const {return fEZEMEndValue;}
+  virtual Float_t GetEZEMCutFraction()  const {return fEZEMCutFraction;}
   
   
  protected:
@@ -98,8 +103,11 @@ class AliZDCCalibData: public TNamed {
   Float_t  fZP1EqualCoeff[5];   // Equalization coefficients for ZN1 PTMs
   Float_t  fZN2EqualCoeff[5];   // Equalization coefficients for ZN1 PTMs
   Float_t  fZP2EqualCoeff[5];   // Equalization coefficients for ZN1 PTMs
+  // --- Coefficients for centrality selection from ZEM signal
+  Float_t fEZEMEndValue;        //End point value of ZEM energy spectrum
+  Float_t fEZEMCutFraction;     //Fraction of ZEM energy spectrum used to cut
   //
-  ClassDef(AliZDCCalibData,6)    // ZDC  Calibration data
+  ClassDef(AliZDCCalibData,7)    // ZDC  Calibration data
 };
 
 #endif