Updated version of calibration class/object

diff --git a/ZDC/AliZDCCalibData.cxx b/ZDC/AliZDCCalibData.cxx
index 8a8fffd66189dda063d43f17cfd8ae1d1dee4766..f3a3a2f56a55bf1c21ded0f39b88341591571bea 100644 (file)
--- a/ZDC/AliZDCCalibData.cxx
+++ b/ZDC/AliZDCCalibData.cxx
@@ -130,10 +130,10 @@ void  AliZDCCalibData::Print(Option_t *) const
    // Printing of calibration object
    printf("\n #######  In-time pedestal values (mean value, sigma)     ####### \n");
    for(int t=0; t<44; t++){
-     if(t==0 || t==24) printf("\n-------- ZN HighRes -------- \n");
-     else if(t==5 || t==29) printf("\n-------- ZN LowRes -------- \n");
-     else if(t==10 || t==34) printf("\n-------- ZP HighRes -------- \n");
-     else if(t==15 || t==39) printf("\n-------- ZP LowRes -------- \n");
+     if(t==0 || t==24) printf("\n-------- ZN1 HighRes -------- \n");
+     else if(t==5 || t==29) printf("\n-------- ZN1 LowRes -------- \n");
+     else if(t==10 || t==34) printf("\n-------- ZP1 HighRes -------- \n");
+     else if(t==15 || t==39) printf("\n-------- ZP1 LowRes -------- \n");
      else if(t==20) printf("\n-------- ZEM1 HighRes --------  \n");
      else if(t==21) printf("\n-------- ZEM1 LowRes --------  \n");
      else if(t==22) printf("\n-------- ZEM2 HighRes --------  \n");
@@ -143,10 +143,10 @@ void  AliZDCCalibData::Print(Option_t *) const
    //
    printf("\n\n\n #######      Out-of-time pedestal values (mean value, sigma) ####### \n");
    for(int t=0; t<44; t++){
-     if(t==0 || t==24) printf("\n-------- ZN HighRes -------- \n");
-     else if(t==5 || t==29) printf("\n-------- ZN LowRes -------- \n");
-     else if(t==10 || t==34) printf("\n-------- ZP HighRes -------- \n");
-     else if(t==15 || t==39) printf("\n-------- ZP LowRes -------- \n");
+     if(t==0 || t==24) printf("\n-------- ZN1 HighRes -------- \n");
+     else if(t==5 || t==29) printf("\n-------- ZN1 LowRes -------- \n");
+     else if(t==10 || t==34) printf("\n-------- ZP1 HighRes -------- \n");
+     else if(t==15 || t==39) printf("\n-------- ZP1 LowRes -------- \n");
      else if(t==20) printf("\n-------- ZEM1 HighRes --------  \n");
      else if(t==21) printf("\n-------- ZEM1 LowRes --------  \n");
      else if(t==22) printf("\n-------- ZEM2 HighRes --------  \n");
@@ -244,3 +244,34 @@ void AliZDCCalibData::SetPMTHVVal(Float_t* HVVal)
   else for(int t=0; t<22; t++) fPMTHVVal[t] = 0.;
 }
  
+//________________________________________________________________
+void AliZDCCalibData::SetZN1EqualCoeff(Float_t* EqualCoeff)
+{
+  // Set ZN1 equalization coefficients
+  if(EqualCoeff) for(int t=0; t<5; t++) fZN1EqualCoeff[t] = EqualCoeff[t];
+  else for(int t=0; t<5; t++) fZN1EqualCoeff[t] = 1.;
+}
+ 
+//________________________________________________________________
+void AliZDCCalibData::SetZP1EqualCoeff(Float_t* EqualCoeff)
+{
+  // Set ZP1 equalization coefficients
+  if(EqualCoeff) for(int t=0; t<5; t++) fZP1EqualCoeff[t] = EqualCoeff[t];
+  else for(int t=0; t<5; t++) fZP1EqualCoeff[t] = 1.;
+}
+//________________________________________________________________
+void AliZDCCalibData::SetZN2EqualCoeff(Float_t* EqualCoeff)
+{
+  // Set ZN2 equalization coefficients
+  if(EqualCoeff) for(int t=0; t<5; t++) fZN2EqualCoeff[t] = EqualCoeff[t];
+  else for(int t=0; t<5; t++) fZN2EqualCoeff[t] = 1.;
+}
+ 
+//________________________________________________________________
+void AliZDCCalibData::SetZP2EqualCoeff(Float_t* EqualCoeff)
+{
+  // Set ZN1 equalization coefficients
+  if(EqualCoeff) for(int t=0; t<5; t++) fZP2EqualCoeff[t] = EqualCoeff[t];
+  else for(int t=0; t<5; t++) fZP2EqualCoeff[t] = 1.;
+}
+ 

diff --git a/ZDC/AliZDCCalibData.h b/ZDC/AliZDCCalibData.h
index 8768ffecd1cb62275177a7901405c27b9ba8a005..2418376349e3023ddb8d6d6ccdb95d0abcd7b7ff 100644 (file)
--- a/ZDC/AliZDCCalibData.h
+++ b/ZDC/AliZDCCalibData.h
@@ -42,6 +42,15 @@ class AliZDCCalibData: public TNamed {
   //
   Float_t  GetPMTHVVal(Int_t channel)   const {return fPMTHVVal[channel];}
   Float_t* GetPMTHVVal()                 const {return (float*)fPMTHVVal;}
+  //
+  Float_t  GetZN1EqualCoeff(Int_t channel) const {return fZN1EqualCoeff[channel];}
+  Float_t* GetZN1EqualCoeffs()            const {return (float*)fZN1EqualCoeff;}
+  Float_t  GetZP1EqualCoeff(Int_t channel) const {return fZP1EqualCoeff[channel];}
+  Float_t* GetZP1EqualCoeffs()            const {return (float*)fZP1EqualCoeff;}
+  Float_t  GetZN2EqualCoeff(Int_t channel) const {return fZN2EqualCoeff[channel];}
+  Float_t* GetZN2EqualCoeffs()            const {return (float*)fZN2EqualCoeff;}
+  Float_t  GetZP2EqualCoeff(Int_t channel) const {return fZP2EqualCoeff[channel];}
+  Float_t* GetZP2EqualCoeffs()            const {return (float*)fZP2EqualCoeff;}
  
   //
   void  SetMeanPed(Int_t channel, Float_t val) {fMeanPedestal[channel]=val;}
@@ -62,6 +71,16 @@ class AliZDCCalibData: public TNamed {
   //
   void         SetPMTHVVal(Int_t channel, Float_t val) {fPMTHVVal[channel]=val;}
   void         SetPMTHVVal(Float_t* HVVal);
+  //
+  void         SetZN1EqualCoeff(Int_t channel, Float_t val) {fZN1EqualCoeff[channel]=val;}
+  void         SetZN1EqualCoeff(Float_t* EqualCoeff);
+  void         SetZP1EqualCoeff(Int_t channel, Float_t val) {fZP1EqualCoeff[channel]=val;}
+  void         SetZP1EqualCoeff(Float_t* EqualCoeff);
+  void         SetZN2EqualCoeff(Int_t channel, Float_t val) {fZN2EqualCoeff[channel]=val;}
+  void         SetZN2EqualCoeff(Float_t* EqualCoeff);
+  void         SetZP2EqualCoeff(Int_t channel, Float_t val) {fZP2EqualCoeff[channel]=val;}
+  void         SetZP2EqualCoeff(Float_t* EqualCoeff);
+  
   
  protected:
   // --- Pedestals
@@ -74,6 +93,11 @@ class AliZDCCalibData: public TNamed {
   Float_t  fEnCalibration[6];   // Coeff. for energy calibration
   // --- PMTs HV values
   Float_t  fPMTHVVal[22];       // PMTs HV values
+  // --- Coefficients for tower calibration
+  Float_t  fZN1EqualCoeff[5];   // Equalization coefficients for ZN1 PTMs
+  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
   //
   ClassDef(AliZDCCalibData,5)    // ZDC  Calibration data
 };

diff --git a/ZDC/Calib/Data/Run0_100_v0_s0.root b/ZDC/Calib/Data/Run0_100_v0_s0.root
index b8e16a185013b990687723465050b056f47d07b9..5cd3ba971be042249b4f16f3b29eee94ef14924c 100644 (file)
Binary files a/ZDC/Calib/Data/Run0_100_v0_s0.root and b/ZDC/Calib/Data/Run0_100_v0_s0.root differ