ALIROOT-5420 Changes for CDH v3

[u/mrichter/AliRoot.git] / ZDC / AliZDCLaserCalib.cxx

diff --git a/ZDC/AliZDCLaserCalib.cxx b/ZDC/AliZDCLaserCalib.cxx
index 8fca52ba966aec8e1eaab8b243e548f06be602dc..cb867c43973f3011f8fb7bf73ac726e5ff67b401 100644 (file)
--- a/ZDC/AliZDCLaserCalib.cxx
+++ b/ZDC/AliZDCLaserCalib.cxx
@@ -41,12 +41,11 @@ TNamed()
   SetName(namst.Data());
   SetTitle(namst.Data());
   Reset();
-  for(Int_t i=0; i<2; i++){
-    fReferenceValue[i] = 0.;
+  for(Int_t i=0; i<24; i++){
+    fDetector[i] = 0;
     fSector[i] = 0;
-    fGain[i] = 0;
-    fPMRefValue[i] = 0.;
-    fPMRefWidth[i] = 0.;
+    fPMValue[i] = 0.;
+    fPMWidth[i] = 0.;
   }
   
   
@@ -60,12 +59,11 @@ AliZDCLaserCalib::AliZDCLaserCalib(const AliZDCLaserCalib& calibda) :
   SetName(calibda.GetName());
   SetTitle(calibda.GetName());
   Reset();
-  for(int t=0; t<2; t++){
-     fReferenceValue[t] = calibda.GetReferenceValue(t);
-     fSector[t] = calibda.GetSector(t);
-     fGain[t] = calibda.GetGain(t);
-     fPMRefValue[t] = calibda.GetPMRefValue(t);
-     fPMRefWidth[t] = calibda.GetPMRefWidth(t);
+  for(int t=0; t<22; t++){
+     fDetector[t] = calibda.GetDetector(t);
+     fSector[t]   = calibda.GetSector(t);
+     fPMValue[t]  = calibda.GetPMValue(t);
+     fPMWidth[t]  = calibda.GetPMWidth(t);
   }
 }
 
@@ -76,12 +74,11 @@ AliZDCLaserCalib &AliZDCLaserCalib::operator =(const AliZDCLaserCalib& calibda)
   SetName(calibda.GetName());
   SetTitle(calibda.GetName());
   Reset();
-  for(int t=0; t<2; t++){
-     fReferenceValue[t] = calibda.GetReferenceValue(t);
-     fSector[t]     = calibda.GetSector(t);
-     fGain[t] = calibda.GetGain(t);
-     fPMRefValue[t] = calibda.GetPMRefValue(t);
-     fPMRefWidth[t] = calibda.GetPMRefWidth(t);
+  for(int t=0; t<22; t++){
+     fDetector[t] = calibda.GetDetector(t);
+     fSector[t]   = calibda.GetSector(t);
+     fPMValue[t]  = calibda.GetPMValue(t);
+     fPMWidth[t]  = calibda.GetPMWidth(t);
   }
 
   return *this;
@@ -96,11 +93,10 @@ AliZDCLaserCalib::~AliZDCLaserCalib()
 void AliZDCLaserCalib::Reset()
 {
   // Reset
-  memset(fReferenceValue,0,2*sizeof(Float_t));
-  memset(fSector,0,2*sizeof(Float_t));
-  memset(fGain,0,2*sizeof(Float_t));
-  memset(fPMRefValue,0,2*sizeof(Float_t));
-  memset(fPMRefWidth,0,2*sizeof(Float_t));
+  memset(fDetector,0,24*sizeof(Float_t));
+  memset(fSector,0,24*sizeof(Float_t));
+  memset(fPMValue,0,24*sizeof(Float_t));
+  memset(fPMWidth,0,24*sizeof(Float_t));
 }                                                                                       
 
 
@@ -109,11 +105,9 @@ void  AliZDCLaserCalib::Print(Option_t *) const
 {
    // Printing of calibration object
    printf("\n\n ******************* AliZDCLaserCalib object *******************\n");
-   for(Int_t i=0; i<2; i++){
-     if(fSector[i]==1.) printf("  side C ->");
-     else if(fSector[i]==4.) printf("  side A->");
-     printf("  Ref.Values %1.2f  Gain %1.0f",fReferenceValue[i], fGain[i]);
-     printf(" PMRefValue = %1.0f  PMRefWidth = %1.0f\n",fPMRefValue[i],fPMRefWidth[i]);
+   for(Int_t i=0; i<24; i++){
+     printf("  Detector %d, sector %d, PMValue = %1.1f +/- %1.1f\n",
+       fDetector[i], fSector[i],fPMValue[i],fPMWidth[i]);
    }
    printf(" ***************************************************************\n\n");
 }