X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALDigit.h;h=d50ba86158358b8f2a616eef3118db3bb275d6fa;hb=fc0882f371b96f1a712eaa5f3475a2ae575fb254;hp=4801b3186073a89bfabdfd6fdc5138b589b48341;hpb=14ce0a6e007cad831e81dd28383a11d24b9495e0;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALDigit.h b/EMCAL/AliEMCALDigit.h index 4801b318607..d50ba861583 100644 --- a/EMCAL/AliEMCALDigit.h +++ b/EMCAL/AliEMCALDigit.h @@ -31,21 +31,23 @@ class AliEMCALDigit : public AliDigitNew { public: AliEMCALDigit() ; - AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEnergy, Float_t Time, Int_t index = -1) ; + AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEnergy, Float_t Time, Int_t index = -1, Float_t dE = 0) ; AliEMCALDigit(const AliEMCALDigit & digit) ; virtual ~AliEMCALDigit() ; Bool_t operator==(const AliEMCALDigit &rValue) const; - AliEMCALDigit& operator+(AliEMCALDigit const &rValue) ; - AliEMCALDigit& operator*(Float_t factor) ; + AliEMCALDigit operator+(const AliEMCALDigit &rValue) ; + AliEMCALDigit operator*(Float_t factor) ; const AliEMCALDigit& operator = (const AliEMCALDigit &) {return *this;} Int_t Compare(const TObject * obj) const ; Float_t GetEta() const ; Int_t GetNprimary() const { return fNprimary ; } Int_t GetPrimary(Int_t index) const ; + Float_t GetDEPrimary(Int_t index) const ; Int_t GetNiparent() const {return fNiparent;} Int_t GetIparent(Int_t index) const ; + Float_t GetDEParent(Int_t index) const ; Float_t GetPhi() const; Float_t GetTime(void) const {return fTime ;} Float_t GetTimeR(void) const {return fTimeR ;} @@ -61,15 +63,17 @@ class AliEMCALDigit : public AliDigitNew { Int_t fNprimary ; // Number of primaries Int_t fNMaxPrimary ; // Max Number of primaries Int_t *fPrimary ; //[fNMaxPrimary] Array of primaries + Float_t *fDEPrimary; //[fNMaxPrimary] Array of primary energy contributions Int_t fNiparent ; // Number of initial parents Int_t fNMaxiparent ; // Max Number of parents Int_t *fIparent ; //[fNMaxiparent] Array of parents + Float_t *fDEParent; //[fNMaxiparent] Array of parent energy contributions Int_t fMaxIter ; // Number to Increment Maxiparent, and MaxPrimary if default is not sufficient Float_t fTime ; // Calculated time Float_t fTimeR ; // Earliest time: to be used by Digits2Raw - ClassDef(AliEMCALDigit,2) // Digit in EMCAL + ClassDef(AliEMCALDigit,3) // Digit in EMCAL } ;