fixcompiler warnings

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALCalibData.h

diff --git a/EMCAL/AliEMCALCalibData.h b/EMCAL/AliEMCALCalibData.h
index cdfad8f075b01c85376d33de7b258753b1352059..3de4f72ea991907bf4d9c5fe91e9ef04bce36909 100644 (file)
--- a/EMCAL/AliEMCALCalibData.h
+++ b/EMCAL/AliEMCALCalibData.h
@@ -7,10 +7,13 @@
 /* $Id$ */
 
 ////////////////////////////////////////////////
-//  class for EMCAL calibration                 //
+//
+//  class for EMCAL calibration               //
+//
 ////////////////////////////////////////////////
 
 #include "TNamed.h"
+#include "AliEMCALGeoParams.h"
 
 class AliEMCALCalibData: public TNamed {
 
@@ -21,19 +24,34 @@ class AliEMCALCalibData: public TNamed {
   AliEMCALCalibData& operator= (const AliEMCALCalibData &calibda);
   virtual ~AliEMCALCalibData();
   void Reset();
-  virtual void Print(Option_t *option = "") const; 
+  virtual void Print(Option_t *option = "") const;
+  
   // All indexes start from 0!
-  Float_t GetADCchannel(Int_t module, Int_t column, Int_t row) const;
-  Float_t GetADCpedestal(Int_t module, Int_t column, Int_t row) const;
+  Float_t GetADCchannel      (Int_t module, Int_t column, Int_t row) const;
+  Float_t GetADCchannelDecal (Int_t module, Int_t column, Int_t row) const;
+  Float_t GetADCpedestal     (Int_t module, Int_t column, Int_t row) const;
+  Float_t GetTimeChannel     (Int_t module, Int_t column, Int_t row) const;
+  Float_t GetTimeChannelDecal(Int_t module, Int_t column, Int_t row) const;
+
   //
-  void SetADCchannel(Int_t module, Int_t column, Int_t row, Float_t value);
-  void SetADCpedestal(Int_t module, Int_t column, Int_t row, Float_t value);
+  void SetADCchannel      (Int_t module, Int_t column, Int_t row, Float_t value);
+  void SetADCchannelDecal (Int_t module, Int_t column, Int_t row, Float_t value);
+  void SetADCpedestal     (Int_t module, Int_t column, Int_t row, Float_t value);
+  void SetTimeChannel     (Int_t module, Int_t column, Int_t row, Float_t value);
+  void SetTimeChannelDecal(Int_t module, Int_t column, Int_t row, Float_t value);
+
+  // Fill for (relative) recalibration (undo 1, apply 2)
+  void Fill(const AliEMCALCalibData *cd1, const AliEMCALCalibData *cd2, Bool_t print=0);
 
  protected:
-  Float_t  fADCchannel[12][48][24] ;  // width of one ADC channel in GeV ([mod][col][row])
-  Float_t  fADCpedestal[12][48][24] ; // value of the  ADC pedestal ([mod][col][row])
+  Float_t  fADCchannel      [AliEMCALGeoParams::fgkEMCALModules][AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows] ; // width of one ADC channel in GeV ([mod][col][row])
+  Float_t  fADCchannelDecal [AliEMCALGeoParams::fgkEMCALModules][AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows] ; // decalibrate width of one ADC channel in GeV ([mod][col][row])
+  Float_t  fADCpedestal     [AliEMCALGeoParams::fgkEMCALModules][AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows] ; // value of the  ADC pedestal ([mod][col][row])
+  Float_t  fTimeChannel     [AliEMCALGeoParams::fgkEMCALModules][AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows] ; // time width of one ADC channel ([mod][col][row])
+  Float_t  fTimeChannelDecal[AliEMCALGeoParams::fgkEMCALModules][AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows] ; // time width of one ADC channel ([mod][col][row])
+
   //
-  ClassDef(AliEMCALCalibData,1)    // EMCAL Calibration data
+  ClassDef(AliEMCALCalibData,2)    // EMCAL Calibration data
 };
 
 #endif