X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALDigit.h;h=bc1343048482a4ce67e4009501c03efc74eff148;hb=304864ab927d252f20e224fae51913bbccd76283;hp=f46d0ac80ff84b1727cfca06f061dbd674335b6d;hpb=814ad4bf0f652105e79d72fafdccb2e80473bdd1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALDigit.h b/EMCAL/AliEMCALDigit.h
index f46d0ac80ff..bc134304848 100644
--- a/EMCAL/AliEMCALDigit.h
+++ b/EMCAL/AliEMCALDigit.h
@@ -9,7 +9,7 @@
 //  EMCAL digit: 
 // 
 //  A  Digit is the sum of energy in a Tower (Hit sum) and stores information, about primaries
-//  and enterring particle contributing to a Digit
+//  and entering particle contributing to a Digit
 //
 //*-- Author: Sahal Yacoob (LBL)
 // based on : AliPHOSDigit
@@ -37,39 +37,38 @@ class AliEMCALDigit : public AliDigitNew {
 
   Bool_t operator==(const AliEMCALDigit &rValue) const;
   AliEMCALDigit& operator+(AliEMCALDigit const &rValue) ;
-    
+  AliEMCALDigit& operator*(Float_t factor) ; 
+ 
   Int_t   Compare(const TObject * obj) const ;  
-  const Float_t GetEta() const ; 
-  Int_t   GetNprimary() const { 
-    // returns the number of primaries
-    return fNprimary ; }
+  Float_t GetEta() const ; 
+  Int_t   GetNprimary() const { return fNprimary ; }
   Int_t   GetPrimary(Int_t index) const ; 
   Int_t   GetNiparent() const {return fNiparent;}
   Int_t   GetIparent(Int_t index) const ;
-  const Float_t GetPhi() const;
+  Float_t GetPhi() const;
   Float_t GetTime(void) const {return fTime ;}
-
-  Bool_t  IsSortable() const { 
-    // says that AliEMCALDigits are sortable (needed for Sort method
-    return kTRUE ; }
-  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    SetAmp(Int_t amp) { fAmp= amp ; } 
+  void    SetId(Int_t id) {fId = id ;}
+  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:
+ private: 
 
   Int_t fNprimary ;     // Number of primaries
-  Int_t fNMaxPrimary ;  //! Max Number of primaries
-  Int_t fPrimary[5] ;   // Array of primaries       
+  Int_t fNMaxPrimary ;  // Max Number of primaries
+  Int_t *fPrimary ;     //[fNMaxPrimary]  Array of primaries       
     
   Int_t fNiparent ;     // Number of initial parents 
-  Int_t fNMaxiparent ;  //! Max Number of parents 
-  Int_t fIparent[50] ;  // Array of parents       
+  Int_t fNMaxiparent ;  // Max Number of parents 
+  Int_t *fIparent ;     //[fNMaxiparent] Array of parents       
+  Int_t fMaxIter  ;     // Number to Increment Maxiparent, and MaxPrimary if default is not sufficient
   Float_t fTime ;       // Calculated time  
-
-  ClassDef(AliEMCALDigit,1)   // Digit in EMCAL 
+  Float_t fTimeR ;      // Earliest time: to be used by Digits2Raw
+ 
+  ClassDef(AliEMCALDigit,2)   // Digit in EMCAL 
 
 } ;