Update to current CDB framework

diff --git a/PHOS/AliPHOSCalibData.cxx b/PHOS/AliPHOSCalibData.cxx
index 78827ce54578ffa792dbd884368bdae39aafb391..6a937b92358747feae19810b3d9de087a557315e 100644 (file)
--- a/PHOS/AliPHOSCalibData.cxx
+++ b/PHOS/AliPHOSCalibData.cxx
@@ -52,7 +52,7 @@ AliPHOSCalibData::AliPHOSCalibData(const AliPHOSCalibData& calibda) :
   SetTitle(calibda.GetName());
   Reset();
   for(Int_t module=0; module<5; module++) {
-    for(Int_t column=0; column<64; column++) {
+    for(Int_t column=0; column<56; column++) {
       for(Int_t row=0; row<64; row++) {
        fADCchannelEmc[module][column][row] = calibda.GetADCchannelEmc(module,column,row);
        fADCpedestalEmc[module][column][row] = calibda.GetADCpedestalEmc(module,column,row);
@@ -69,7 +69,7 @@ AliPHOSCalibData &AliPHOSCalibData::operator =(const AliPHOSCalibData& calibda)
   SetTitle(calibda.GetName());
   Reset();
   for(Int_t module=0; module<5; module++) {
-    for(Int_t column=0; column<64; column++) {
+    for(Int_t column=0; column<56; column++) {
       for(Int_t row=0; row<64; row++) {
        fADCchannelEmc[module][column][row] = calibda.GetADCchannelEmc(module,column,row);
        fADCpedestalEmc[module][column][row] = calibda.GetADCpedestalEmc(module,column,row);
@@ -89,8 +89,8 @@ AliPHOSCalibData::~AliPHOSCalibData()
 void AliPHOSCalibData::Reset()
 {
   // Set all pedestals to 0 and all ADC channels to 1
-  memset(fADCchannelEmc ,0,5*64*56*sizeof(Float_t));
-  memset(fADCpedestalEmc,1,5*64*56*sizeof(Float_t));
+  memset(fADCchannelEmc ,1,5*64*56*sizeof(Float_t));
+  memset(fADCpedestalEmc,0,5*64*56*sizeof(Float_t));
 }
 
 //________________________________________________________________
@@ -102,7 +102,7 @@ void  AliPHOSCalibData::Print(Option_t *option) const
     printf("\n ----    Pedestal values ----\n\n");
     for (Int_t module=0; module<5; module++){
       printf("============== Module %d\n",module+1);
-      for (Int_t column=0; column<64; column++){
+      for (Int_t column=0; column<56; column++){
        for (Int_t row=0; row<64; row++){
          printf("%4.1f",fADCpedestalEmc[module][column][row]);
        }
@@ -115,7 +115,7 @@ void  AliPHOSCalibData::Print(Option_t *option) const
     printf("\n ----    ADC channel values      ----\n\n");
     for (Int_t module=0; module<5; module++){
       printf("============== Module %d\n",module+1);
-      for (Int_t column=0; column<64; column++){
+      for (Int_t column=0; column<56; column++){
        for (Int_t row=0; row<64; row++){
          printf("%4.1f",fADCchannelEmc[module][column][row]);
        }
@@ -124,3 +124,26 @@ void  AliPHOSCalibData::Print(Option_t *option) const
     }
   }
 }
+
+Float_t AliPHOSCalibData::GetADCchannelEmc(Int_t module, Int_t column, Int_t row) const
+{
+  //module, column,raw should follow the internal PHOS convention:
+  //module 1:5, column 1:56, row 1:64
+
+  return fADCchannelEmc[module-1][column-1][row-1];
+}
+
+Float_t AliPHOSCalibData::GetADCpedestalEmc(Int_t module, Int_t column, Int_t row) const
+{
+  return fADCpedestalEmc[module-1][column-1][row-1];
+}
+
+void AliPHOSCalibData::SetADCchannelEmc(Int_t module, Int_t column, Int_t row, Float_t value)
+{
+  fADCchannelEmc[module-1][column-1][row-1] = value;
+}
+
+void AliPHOSCalibData::SetADCpedestalEmc(Int_t module, Int_t column, Int_t row, Float_t value)
+{
+  fADCpedestalEmc[module-1][column-1][row-1] = value;
+}

diff --git a/PHOS/AliPHOSCalibData.h b/PHOS/AliPHOSCalibData.h
index 142872105b85bfe3aa2531aad6e7ce2a92c21c35..05c0384598f486f319b03f810305a23f473c7b99 100644 (file)
--- a/PHOS/AliPHOSCalibData.h
+++ b/PHOS/AliPHOSCalibData.h
@@ -24,15 +24,15 @@ class AliPHOSCalibData: public TNamed {
   void Reset();
   virtual void Print(Option_t *option = "") const; 
   //
-  Float_t GetADCchannelEmc(Int_t module, Int_t column, Int_t row) const {return fADCchannelEmc[module][column][row];}
-  Float_t GetADCpedestalEmc(Int_t module, Int_t column, Int_t row) const {return fADCpedestalEmc[module][column][row];}
+  Float_t GetADCchannelEmc(Int_t module, Int_t column, Int_t row) const;
+  Float_t GetADCpedestalEmc(Int_t module, Int_t column, Int_t row) const;
   //
-  void SetADCchannelEmc(Int_t module, Int_t column, Int_t row, Float_t value)  {fADCchannelEmc[module][column][row] = value;}
-  void SetADCpedestalEmc(Int_t module, Int_t column, Int_t row, Float_t value) {fADCpedestalEmc[module][column][row] = value;}
+  void SetADCchannelEmc(Int_t module, Int_t column, Int_t row, Float_t value);
+  void SetADCpedestalEmc(Int_t module, Int_t column, Int_t row, Float_t value);
 
  protected:
-  Float_t  fADCchannelEmc[5][64][56] ;           // width of one ADC channel in GeV
-  Float_t  fADCpedestalEmc[5][64][56] ;          // value of the EMC ADC pedestal
+  Float_t  fADCchannelEmc[5][56][64] ;  // width of one ADC channel in GeV ([mod][col][row])
+  Float_t  fADCpedestalEmc[5][56][64] ; // value of the EMC ADC pedestal ([mod][col][row])
   //
   ClassDef(AliPHOSCalibData,1)    // PHOS Calibration data
 };