coding conventions corrections

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

diff --git a/PHOS/AliPHOSDigitizer.h b/PHOS/AliPHOSDigitizer.h
index 4842551d912fde103e22fd49cf60591373a156ab..a48108294315c27b34da85a3fdb134b405b85a89 100644 (file)
--- a/PHOS/AliPHOSDigitizer.h
+++ b/PHOS/AliPHOSDigitizer.h
@@ -18,6 +18,7 @@
 #include "TObjString.h"
 class TArrayI ;
 class TClonesArray ; 
+class TFile ; 
 
 // --- Standard library ---
 
@@ -68,18 +69,12 @@ public:
 
   //General
   const Int_t   GetDigitsInRun()  const { return fDigitsInRun ;}  
-  //  const TString GetHitsFileName() const { return fHitsFileName ; }
-  //  const TString GetSDigitsFileName() const { return fSDigitsFileName ; }
-
-  void    MixWith(const char* HeaderFile) ; // Add another one file to mix
+  void    MixWith(const char* HeaderFile,const char* brname = 0) ; // Add another one file to mix
   void    Print(Option_t* option)const ;
-  // void    Reset() ;   //restarts starts event processing from 0 event(s)
-  //  void    SetSplitFile(const TString splitFileName = "PHOS.Digits.root") ;
-  // void    SetSDigitsBranch(const char* file) ;
-
+ 
   AliPHOSDigitizer & operator = (const AliPHOSDigitizer & rvalue)  {
     // assignement operator requested by coding convention but not needed
-    abort() ;
+    Fatal("operator =", "not implemented") ;
     return *this ; 
   }
 
@@ -89,17 +84,17 @@ private:
   void    InitParameters() ; 
   void    PrintDigits(Option_t * option) ;
   void    WriteDigits(Int_t evt) ;            // Writes Digits for particular event
-  Float_t TimeOfNoise(void) ;                 // Calculate time signal generated by noise
+  Float_t TimeOfNoise(void) const;            // Calculate time signal generated by noise
   //Calculate the time of crossing of the threshold by front edge
-  Float_t FrontEdgeTime(TClonesArray * ticks) ; 
+  Float_t FrontEdgeTime(TClonesArray * ticks) const ; 
   //Calculate digitized signal with gived ADC parameters
   Int_t   DigitizeEnergy(Float_t energy, Int_t absId) ;
 
 private:
 
-  //  TString fHitsFileName ;           // file name that contains the original hits
-  //  TString fSDigitsFileName ;        // file name that contains the original SDigits
   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
+
   Int_t   fEmcCrystals ;            // Number of EMC crystalls in the given geometry
 
   Float_t fPinNoise ;               // Electronics noise in EMC
@@ -108,18 +103,17 @@ private:
   Float_t fCPVNoise ;               // Noise in CPV
   Float_t fCPVDigitThreshold  ;     // Threshold for storing digits in CPV
 
-  Int_t fDigitsInRun ;              //! Total number of digits in one run
 
   Float_t fTimeResolution ;         // Time resolution of FEE electronics
   Float_t fTimeThreshold ;          // Threshold to start timing for given crystall
   Float_t fTimeSignalLength ;       // Length of the timing signal 
 
   Float_t fADCchanelEmc ;           // width of one ADC channel in GeV
-  Float_t fADCpedestalEmc ;         //
+  Float_t fADCpedestalEmc ;         // value of the EMC ADC pedestal
   Int_t   fNADCemc ;                // number of channels in EMC ADC
 
-  Float_t fADCchanelCpv ;           // width of one ADC channel in CPV 'popugais'
-  Float_t fADCpedestalCpv ;         // 
+  Float_t fADCchanelCpv ;           // width of one ADC channel in CPV units
+  Float_t fADCpedestalCpv ;         // value of the CPV ADC pedestal in CPV units
   Int_t   fNADCcpv ;                // number of channels in CPV ADC
 
   Bool_t  fToSplit ;                //! Do we work in the split mode