Changed the data format to pass to the Make methods

[u/mrichter/AliRoot.git] / HLT / PHOS / AliHLTPHOSEmcCalibData.h

diff --git a/HLT/PHOS/AliHLTPHOSEmcCalibData.h b/HLT/PHOS/AliHLTPHOSEmcCalibData.h
index 12eb12b3e4570cea38c23ee1a5048b4b0aa3a8b9..324aeca58cebc86fcba3c28b1226eca81090fa78 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSEmcCalibData.h
+++ b/HLT/PHOS/AliHLTPHOSEmcCalibData.h
@@ -1,3 +1,4 @@
+
 #ifndef ALIHLTPHOSEMCCALIBDATA_H
 #define ALIHLTPHOSEMCCALIBDATA_H
 
@@ -8,9 +9,12 @@
 //  class for EMC calibration                 //
 ////////////////////////////////////////////////
 
+
 #include "TNamed.h"
-#include "AliHLTPHOSCommonDefs.h"
+#include "AliHLTPHOSConstants.h"
+
 
+using namespace PhosHLTConst;
 
 class AliHLTPHOSEmcCalibData: public TNamed {
 
@@ -28,10 +32,10 @@ class AliHLTPHOSEmcCalibData: public TNamed {
   void SetADCpedestalEmcMeasured(Int_t module, Int_t column, Int_t row, Int_t gain, Float_t value);
   void MakeADCpedestalCorrectionTable(); 
  protected:
-  Float_t  fADCchannelEnergy[PHOS_MODULES][PHOS_COLUMNS][PHOS_ROWS][PHOS_GAINS] ;  /**<width of one EMC ADC channel in GeV*/
-  Float_t  fADCpedestalEmcMeasured[PHOS_MODULES][PHOS_COLUMNS][PHOS_ROWS][PHOS_GAINS] ; /**<value of the EMC ADC pedestal measured from calibration run*/
-  Int_t  fADCpedestalAltroReg[PHOS_MODULES][PHOS_COLUMNS][PHOS_ROWS][PHOS_GAINS] ; /**<value of the EMC ADC pedestal subtraction values stored in the ALTRO registers*/
-  Float_t  fADCpedestalCorrectionTable[PHOS_MODULES][PHOS_COLUMNS][PHOS_ROWS][PHOS_GAINS] ; /**<value of the EMC ADC pedestal values to be subtracted form the decoed cahnnel data (= fADCpedestalEmcMeasured - fADCpedestalAltroReg)*/
+  Float_t  fADCchannelEnergy[N_MODULES][N_XCOLUMNS_MOD][N_ZROWS_MOD][N_GAINS] ;  /**<width of one EMC ADC channel in GeV*/
+  Float_t  fADCpedestalEmcMeasured[N_MODULES][N_XCOLUMNS_MOD][N_ZROWS_MOD][N_GAINS] ; /**<value of the EMC ADC pedestal measured from calibration run*/
+  Int_t    fADCpedestalAltroReg[N_MODULES][N_XCOLUMNS_MOD][N_ZROWS_MOD][N_GAINS] ; /**<value of the EMC ADC pedestal subtraction values stored in the ALTRO registers*/
+  Float_t  fADCpedestalCorrectionTable[N_MODULES][N_XCOLUMNS_MOD][N_ZROWS_MOD][N_GAINS] ; /**<value of the EMC ADC pedestal values to be subtracted form the decoed cahnnel data (= fADCpedestalEmcMeasured - fADCpedestalAltroReg)*/
 
   ClassDef(AliHLTPHOSEmcCalibData,1)    // PHOS EMC calibration data
 };