X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALCalibData.h;h=268aaf59392d1d39fda80d255edf7dd115753434;hb=a27423bf0cdff6ebb12c81be41c681d9a7fbbb6e;hp=d06fd1f51d9db31f5549ff07a4c5ab5b3fb90a04;hpb=63c22917b027ae43bfb2f72af95c47f190bd7ff1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALCalibData.h b/EMCAL/AliEMCALCalibData.h
index d06fd1f51d9..268aaf59392 100644
--- a/EMCAL/AliEMCALCalibData.h
+++ b/EMCAL/AliEMCALCalibData.h
@@ -18,46 +18,44 @@
 class AliEMCALCalibData: public TNamed {
 
  public:
+
   AliEMCALCalibData();
   AliEMCALCalibData(const char* name);
   AliEMCALCalibData(const AliEMCALCalibData &calibda);
   AliEMCALCalibData& operator= (const AliEMCALCalibData &calibda);
-  virtual ~AliEMCALCalibData();
-  void Reset();
-  virtual void Print(Option_t *option = "") const;
+  virtual ~AliEMCALCalibData() { ; }
+  
+  void    Reset();
+  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 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;
+  Float_t GetTimeChannel     (Int_t module, Int_t column, Int_t row, Int_t bc) const;
 	
-  Float_t GetADCchannelRef   () {return fADCchannelRef;}
-
-  //
-  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);
+  Float_t GetADCchannelRef   () const { return fADCchannelRef ; }
 
-  void SetADCchannelRef   (Float_t value) {fADCchannelRef = 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    SetTimeChannelDecal(Int_t module, Int_t column, Int_t row, Float_t value);
+  void    SetTimeChannel     (Int_t module, Int_t column, Int_t row, Int_t bc, Float_t value);
 
-  // Fill for (relative) recalibration (undo 1, apply 2)
-  void Fill(const AliEMCALCalibData *cd1, const AliEMCALCalibData *cd2, Bool_t print=0);
+  void    SetADCchannelRef   (Float_t value) { fADCchannelRef = value ; }
 
  protected:
+
+  Float_t  fADCchannelRef ;  // base value of the ADC channel set from cosmics calibration
+
   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])
-
-  Float_t  fADCchannelRef;
+  Float_t  fADCpedestal     [AliEMCALGeoParams::fgkEMCALModules][AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows] ; // value of the  ADC pedestal ([mod][col][row]), not used
+  Float_t  fTimeChannelDecal[AliEMCALGeoParams::fgkEMCALModules][AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows] ;    // time shift of one ADC channel ([mod][col][row])
+  Float_t  fTimeChannel     [AliEMCALGeoParams::fgkEMCALModules][AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows][4] ; // time shift of one ADC channel ([mod][col][row][bunch crossing number])
 
-  //
-  ClassDef(AliEMCALCalibData,3)    // EMCAL Calibration data
+  ClassDef(AliEMCALCalibData,4)    // EMCAL Calibration data
 };
 
 #endif