Corrections for gcc 4.0

[u/mrichter/AliRoot.git] / PHOS / AliPHOSDigitizer.h

diff --git a/PHOS/AliPHOSDigitizer.h b/PHOS/AliPHOSDigitizer.h
index 480d41051f9ecb600b3b7fd6084168fd7b71297c..da440984721b7f0826d058c69b44b5f8658ae586 100644 (file)
--- a/PHOS/AliPHOSDigitizer.h
+++ b/PHOS/AliPHOSDigitizer.h
@@ -5,6 +5,11 @@
 
 /* $Id$ */
 
+/* History of cvs commits:
+ *
+ * $Log$
+ */
+
 //_________________________________________________________________________
 //  Task Class for making SDigits in PHOS      
 // Class performs digitization of Summable digits (in the PHOS case this is just
@@ -15,7 +20,7 @@
 
 
 // --- ROOT system ---
-#include "TObjString.h"
+//#include "TObjString.h"
 class TArrayI ;
 class TClonesArray ; 
 
@@ -30,19 +35,19 @@ class AliPHOSDigitizer: public AliDigitizer {
 
 public:
   AliPHOSDigitizer() ;          // ctor
-  AliPHOSDigitizer(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; 
+  AliPHOSDigitizer(TString alirunFileNameFile, TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; 
   AliPHOSDigitizer(const AliPHOSDigitizer & dtizer) ;
   AliPHOSDigitizer(AliRunDigitizer * manager) ;
   virtual ~AliPHOSDigitizer() ;       
 
-  void    Digitize(const Int_t event) ;            // Make Digits from SDigits 
+  void    Digitize(Int_t event) ;            // Make Digits from SDigits 
   void    Exec(Option_t *option);                  // Supervising method
 
   //CPV parameters
-  const Float_t GetCPVNoise()     const { return fCPVNoise ;}
-  const Float_t GetCPVThreshold() const { return fCPVDigitThreshold ;}
-  const Float_t GetCPVchannel()   const { return fADCchanelCpv; }
-  const Float_t GetCPVpedestal()  const { return fADCpedestalCpv; }
+  Float_t GetCPVNoise()     const { return fCPVNoise ;}
+  Float_t GetCPVThreshold() const { return fCPVDigitThreshold ;}
+  Float_t GetCPVchannel()   const { return fADCchanelCpv; }
+  Float_t GetCPVpedestal()  const { return fADCpedestalCpv; }
 
   void    SetCPVNoise(Float_t CPVNoise)          {fCPVNoise = CPVNoise;}
   void    SetCPVThreshold(Float_t CPVThreshold)  {fCPVDigitThreshold= CPVThreshold;}
@@ -52,11 +57,11 @@ public:
 
 
   //EMC parameters
-  const Float_t GetEMCThreshold() const { return fEMCDigitThreshold;}
-  const Float_t GetEMCchannel()   const { return fADCchanelEmc; }
-  const Float_t GetEMCpedestal()  const { return fADCpedestalEmc; }  
-  const Float_t GetPinNoise()     const { return fPinNoise;}
-  const Float_t GetTimeResolution() const { return fTimeResolution ; }
+  Float_t GetEMCThreshold() const { return fEMCDigitThreshold;}
+  Float_t GetEMCchannel()   const { return fADCchanelEmc; }
+  Float_t GetEMCpedestal()  const { return fADCpedestalEmc; }  
+  Float_t GetPinNoise()     const { return fPinNoise;}
+  Float_t GetTimeResolution() const { return fTimeResolution ; }
 
   void   SetEMCThreshold(Float_t EMCThreshold)  {fEMCDigitThreshold = EMCThreshold;}
   void   SetPinNoise(Float_t PinNoise )         {fPinNoise = PinNoise;}
@@ -65,14 +70,16 @@ public:
   void   SetEMCpedestal(Float_t ped)   { fADCpedestalEmc = ped ; }  
   void   SetEventFolderName(TString name) { fEventFolderName = name ; }
   void   SetTimeResolution(Float_t res){ fTimeResolution = res ; }  
+  void   SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; }
 
   //General
-  const Int_t   GetDigitsInRun()  const { return fDigitsInRun ;}  
-  void    MixWith(const TString alirunFileName, 
-                 const TString eventFolderName = AliConfig::fgkDefaultEventFolderName) ; // Add another one file to mix
-  void    Print()const ;
+  Int_t   GetDigitsInRun()  const { return fDigitsInRun ;}  
+  void    MixWith(TString alirunFileName, 
+                 TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; // Add another one file to mix
+
+  void    Print(const Option_t * = "")const ;
  
-  AliPHOSDigitizer & operator = (const AliPHOSDigitizer & rvalue)  {
+  AliPHOSDigitizer & operator = (const AliPHOSDigitizer & /*rvalue*/)  {
     // assignement operator requested by coding convention but not needed
     Fatal("operator =", "not implemented") ;
     return *this ; 
@@ -124,8 +131,10 @@ private:
   Int_t   fNADCcpv ;                // number of channels in CPV ADC
 
   TString fEventFolderName;         // skowron: name of EFN to read data from in stand alone mode
-  
-  ClassDef(AliPHOSDigitizer,2)  // description 
+  Int_t   fFirstEvent;        // first event to process
+  Int_t   fLastEvent;         // last  event to process 
+ 
+  ClassDef(AliPHOSDigitizer,3)  // description 
 
 };