Updating geometry for new scintillaton modules

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

diff --git a/EMCAL/AliEMCALDigitizer.h b/EMCAL/AliEMCALDigitizer.h
index b300fb6f4f9e25b24573cdf3882a7976204e500a..970b82c4bf79d81ec3abe940f52b6086b570f48e 100644 (file)
--- a/EMCAL/AliEMCALDigitizer.h
+++ b/EMCAL/AliEMCALDigitizer.h
@@ -31,33 +31,29 @@ class AliEMCALDigitizer: public AliDigitizer {
 
 public:
   AliEMCALDigitizer() ;          // ctor
-  AliEMCALDigitizer(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ;  
+  AliEMCALDigitizer(TString alirunFileNameFile, TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ;  
   AliEMCALDigitizer(const AliEMCALDigitizer & dtizer) ;
   AliEMCALDigitizer(AliRunDigitizer * manager) ;
   virtual ~AliEMCALDigitizer() ;       
 
-  void    Digitize(const Int_t event);          // Make Digits from SDigits stored in fSDigits
+  void    Digitize(Int_t event);          // Make Digits from SDigits stored in fSDigits
   void    Exec(Option_t *option);               // Supervising method
 
-  const Float_t GetDigitThreshold() const { return fDigitThreshold;}
-  const Float_t GetPedestal()       const { return fPedestal; }
-  const Float_t GetPinNoise()       const { return fPinNoise;}
-  const Float_t GetSlope()          const { return fSlope; }
-  const Float_t GetTimeResolution() const { return fTimeResolution ; }
-  const Float_t GetECAchannel()     const { return fADCchannelEC ; }
-  const Float_t GetECApedestal()    const { return fADCpedestalEC ; }
-  const Float_t GetHCAchannel()     const { return fADCchannelHC ; }
-  const Float_t GetHCApedestal()    const { return fADCpedestalHC ; }
-  const Float_t GetPREchannel()     const { return fADCchannelPRE ; }
-  const Float_t GetPREpedestal()    const { return fADCpedestalPRE ; }
-
+  Float_t GetDigitThreshold() const { return fDigitThreshold;}
+  Float_t GetPedestal()       const { return fPedestal; }
+  Float_t GetPinNoise()       const { return fPinNoise;}
+  Float_t GetSlope()          const { return fSlope; }
+  Float_t GetTimeResolution() const { return fTimeResolution ; }
+  Float_t GetECAchannel()     const { return fADCchannelEC ; }
+  Float_t GetECApedestal()    const { return fADCpedestalEC ; }
+ void   SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; }
   void    SetDigitThreshold(Float_t EMCThreshold)  {fDigitThreshold = EMCThreshold;}
   void    SetPinNoise(Float_t PinNoise )         {fPinNoise = PinNoise;}
 
   //General
-  const Int_t   GetDigitsInRun()  const { return fDigitsInRun; } 
-  void  MixWith(const TString alirunFileName, 
-               const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; // Add another one file to mix
+  Int_t   GetDigitsInRun()  const { return fDigitsInRun; } 
+  void  MixWith(TString alirunFileName, 
+               TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; // Add another one file to mix
   void  Print()const ;
  
   AliEMCALDigitizer & operator = (const AliEMCALDigitizer & /*rvalue*/)  {
@@ -77,7 +73,7 @@ private:
 
   //Calculate the time of crossing of the threshold by front edge
   Float_t FrontEdgeTime(TClonesArray * ticks) ;
-  Int_t   DigitizeEnergy(Float_t energy, Int_t absId) ;
+  Int_t   DigitizeEnergy(Float_t energy) ;
 
 private:
   
@@ -100,16 +96,12 @@ private:
   Float_t fADCchannelEC ;         // width of one ADC channel in EC section (GeV)
   Float_t fADCpedestalEC ;        //
   Int_t   fNADCEC ;               // number of channels in EC section ADC
-  Float_t fADCchannelHC ;         // width of one ADC channel in HC section (GeV)
-  Float_t fADCpedestalHC ;        //
-  Int_t   fNADCHC ;               // number of channels in HC section ADC
-  Float_t fADCchannelPRE ;        // width of one ADC channel in PRE section (GeV)
-  Float_t fADCpedestalPRE ;       // 
-  Int_t fNADCPRE ;                // number of channels in PRE 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
 
-  ClassDef(AliEMCALDigitizer,4)  // description 
+  ClassDef(AliEMCALDigitizer,5)  // description 
 
 };