corrected error in call AliReadESD

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

diff --git a/PHOS/AliPHOSDigit.h b/PHOS/AliPHOSDigit.h
index 785c20680e83bcd9d3b186ee59859e8c6f92bfe8..e4aa8351f502f79960ec2b78e92772f9cbf0ccbd 100644 (file)
--- a/PHOS/AliPHOSDigit.h
+++ b/PHOS/AliPHOSDigit.h
@@ -5,19 +5,24 @@
 
 /* $Id$ */
 
+/* History of cvs commits:
+ *
+ * $Log$
+ */
+
 //_________________________________________________________________________
 //  PHOS digit: Id
 //              energy
 //              3 identifiers for the primary particle(s) at the origine of the digit
 //  The digits are made in FinishEvent() by summing all the hits in a single PHOS crystal or PPSD gas cell
-//  It would be nice to replace the 3 identifiers by an array, but, because digits are kept in a TClonesQArray,
+//  It would be nice to replace the 3 identifiers by an array, but, because digits are kept in a TClonesArray,
 //   it is not possible to stream such an array... (beyond my understqnding!)
 //
 //*-- Author: Laurent Aphecetche & Yves Schutz (SUBATECH)
 
 // --- ROOT system ---
 
-#include "TObject.h" 
+//#include "TObject.h" 
 
 // --- Standard library ---
 
@@ -38,31 +43,29 @@ class AliPHOSDigit : public AliDigitNew {
 
   Bool_t operator==(const AliPHOSDigit &rValue) const;
   AliPHOSDigit& operator+(AliPHOSDigit const &rValue) ;
-    
+  AliPHOSDigit& operator*(Float_t factor) ; 
+  //  AliPHOSDigit& operator=(const AliPHOSDigit) {
+  //  Fatal("operator = ", "not implemented") ; return *this ; } 
   Int_t   Compare(const TObject * obj) const ;  
-  Int_t   GetNprimary() const { 
-    // returns the number of primaries
-    return fNprimary ; }
+  Int_t   GetNprimary() const { return fNprimary ; }
   Int_t   GetPrimary(Int_t index) const ; 
   Float_t GetTime(void) const {return fTime ;}
-  Bool_t  IsSortable() const { 
-    // says that AliPHOSDigits are sortable (needed for Sort method
-    return kTRUE ; }
-  void    Print(Option_t *option) const;
-  void    SetAmp(Int_t Amp) { 
-    // sets the amplitude data member 
-    fAmp=Amp ; } 
-  void    SetTime(Float_t Time) {fTime = Time ;}
-  void ShiftPrimary(Int_t shift); // shift to semarate different TreeK in merging
+  Float_t GetTimeR(void) const {return fTimeR ;}
+  Bool_t  IsSortable() const { return kTRUE ; }
+  void    Print(const Option_t * = "") const;
+  void    SetAmp(Int_t Amp) { fAmp=Amp ; } 
+  void    SetTime(Float_t time) {fTime = time ;}
+  void    SetTimeR(Float_t time) {fTimeR = time ;}
+  void    ShiftPrimary(Int_t shift); // shift to separate different TreeK in merging
 
  private:
 
-  Int_t fNprimary ;     // Number of primaries
-  Int_t fNMaxPrimary ;  //! Max Number of primaries
-  Int_t fPrimary[5] ;   // Array of primaries      
-  Float_t fTime ; 
+  Int_t fNprimary ;        // Number of primaries
+  Int_t * fPrimary ;       //[fNprimary] Array of primaries      
+  Float_t fTime ;          // Calculcated time 
+  Float_t fTimeR ;         // Earliest time: to be used by Digits2Raw
     
-  ClassDef(AliPHOSDigit,1)   // Digit in PHOS 
+  ClassDef(AliPHOSDigit,3)   // Digit in PHOS 
 
 } ;