- fixing warnings

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

diff --git a/EMCAL/AliEMCALDigitizer.h b/EMCAL/AliEMCALDigitizer.h
index 3284d0d712e742f1febaeb914cd8808be70c99b3..051c2623b049467480720890c322d394aa0d4013 100644 (file)
--- a/EMCAL/AliEMCALDigitizer.h
+++ b/EMCAL/AliEMCALDigitizer.h
@@ -36,7 +36,7 @@ class TBrowser;
 #include "AliConfig.h"
 class AliEMCALCalibData ;
 class AliEMCALSDigitizer ;
-class AliRunDigitizer ;
+class AliDigitizationInput ;
 
 class AliEMCALDigitizer: public AliDigitizer {
 
@@ -45,11 +45,11 @@ public:
   AliEMCALDigitizer(TString alirunFileNameFile, 
                     TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ;  
   AliEMCALDigitizer(const AliEMCALDigitizer & dtizer) ;
-  AliEMCALDigitizer(AliRunDigitizer * manager) ;
+  AliEMCALDigitizer(AliDigitizationInput * manager) ;
   virtual ~AliEMCALDigitizer() ;       
 
   void     Digitize(Int_t event);   // Make Digits from SDigits stored in fSDigits
-  void     Exec(Option_t *option);  // Supervising method
+  void     Digitize(Option_t *option);  // Supervising method
 
   Int_t    GetDigitThreshold()     const { return fDigitThreshold     ; }
   Float_t  GetPinNoise()           const { return fPinNoise           ; }
@@ -97,35 +97,37 @@ private:
        
 private:
   
-  Bool_t   fDefaultInit;         //! Says if the task was created by defaut ctor (only parameters are initialized)
-  Int_t    fDigitsInRun ;        //! Total number of digits in one run
-  Bool_t   fInit ;               //! To avoid overwriting existing files
-
-  Int_t    fInput ;              // Number of files to merge
-  TString *fInputFileNames ;     //[fInput] List of file names to merge 
-  TString *fEventNames ;         //[fInput] List of event names to merge
-
-  Int_t    fDigitThreshold  ;     // Threshold for storing digits in EMC, ACD units
-  Int_t    fMeanPhotonElectron ;  // number of photon electrons per GeV deposited energy 
-  Float_t  fPinNoise ;            // Electronics noise in EMC, APD
-  Double_t fTimeNoise;            // Electronics noise in EMC, time
-  Double_t fTimeDelay;            // Time delay to reproduce data delay
-  Double_t fTimeResolutionPar0 ;  // Time resolution of FEE electronics
-  Double_t fTimeResolutionPar1 ;  // Time resolution of FEE electronics
-  Float_t  fADCchannelEC ;        // calibration width of one ADC channel in EC section (GeV)
-  Float_t  fADCpedestalEC ;       // calibration pedestal for one ADC channel
-  Float_t  fADCchannelECDecal ;   // decalibration width of one ADC channel in EC section (GeV)
-  Float_t  fTimeChannel ;         // calibration time width for one channel  
-  Float_t  fTimeChannelDecal ;    // calibration time width for one channel  
-  Int_t    fNADCEC ;              // number of channels in EC section ADC
-
-  TString  fEventFolderName;      // skowron: name of EFN to read data from in stand alone mode
-  Int_t    fFirstEvent;           // first event to process
-  Int_t    fLastEvent;            // last  event to process
+  Bool_t   fDefaultInit;           //! Says if the task was created by defaut ctor (only parameters are initialized)
+  Int_t    fDigitsInRun ;          //! Total number of digits in one run
+  Bool_t   fInit ;                 //! To avoid overwriting existing files
+
+  Int_t    fInput ;                // Number of files to merge
+  TString *fInputFileNames ;       //[fInput] List of file names to merge 
+  TString *fEventNames ;           //[fInput] List of event names to merge
+
+  Int_t    fDigitThreshold  ;      // Threshold for storing digits in EMC, ACD units
+  Int_t    fMeanPhotonElectron ;   // number of photon electrons per GeV deposited energy 
+  Float_t  fGainFluctuations ;     // correct fMeanPhotonElectron by the gain fluctuations
+  Float_t  fPinNoise ;             // Electronics noise in EMC, APD
+  Double_t fTimeNoise;             // Electronics noise in EMC, time
+  Double_t fTimeDelay;             // Time delay to reproduce data delay
+  Double_t fTimeResolutionPar0 ;   // Time resolution of FEE electronics
+  Double_t fTimeResolutionPar1 ;   // Time resolution of FEE electronics
+  Float_t  fADCchannelEC ;         // calibration width of one ADC channel in EC section (GeV)
+  Float_t  fADCpedestalEC ;        // calibration pedestal for one ADC channel
+  Float_t  fADCchannelECDecal ;    // decalibration width of one ADC channel in EC section (GeV)
+  Float_t  fTimeChannel ;          // calibration time width for one channel  
+  Float_t  fTimeChannelDecal ;     // calibration time width for one channel  
+  Int_t    fNADCEC ;               // number of channels in EC section ADC
+
+  TString  fEventFolderName;       // skowron: name of EFN to read data from in stand alone mode
+  Int_t    fFirstEvent;            // first event to process
+  Int_t    fLastEvent;             // last  event to process
        
-  AliEMCALCalibData * fCalibData; //Calibration data pointer
-
-  ClassDef(AliEMCALDigitizer,11)  // description 
+  AliEMCALCalibData * fCalibData;  // Calibration data pointer
+  AliEMCALSDigitizer* fSDigitizer; // SDigitization object
+  
+  ClassDef(AliEMCALDigitizer,13)  
 };