put back previous default value, although decission needs to be made to which one...

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALHit.h

diff --git a/EMCAL/AliEMCALHit.h b/EMCAL/AliEMCALHit.h
index f6ab2dd7f8081aca0bdc48291d60467a16d58e7f..eedd2919064576ec43548cd11731ac32a1929287 100644 (file)
--- a/EMCAL/AliEMCALHit.h
+++ b/EMCAL/AliEMCALHit.h
@@ -16,17 +16,17 @@
 // --- AliRoot header files ---
 #include "AliHit.h"
 
+using std::ostream;
 
 class AliEMCALHit : public AliHit {
     
   friend ostream& operator << (ostream&,AliEMCALHit&);
  
 public:
-
   AliEMCALHit(); // default ctor
   AliEMCALHit(const AliEMCALHit & hit);
-  AliEMCALHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t iparent, Float_t ienergy, Int_t id,
-             Float_t *hits,Float_t *p);
+  AliEMCALHit& operator = (const AliEMCALHit& source) ;
+  AliEMCALHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t iparent, Float_t ienergy, Int_t id, Float_t *hits,Float_t *p);
   virtual ~AliEMCALHit(void) {}// dtor
   //returns the energy loss for this hit
   Float_t GetEnergy(void) const{return fELOS;}
@@ -40,11 +40,15 @@ public:
   Float_t GetTime(void)     const {
     // returns the time of the first energy deposition
     return fTime ;}
-  
+
   Float_t GetPx(void) const{return fPx;}
   Float_t GetPy(void) const{return fPy;}
   Float_t GetPz(void) const{return fPz;}
   Float_t GetPe(void) const{return fPe;}
+
+  void   SetIparent(Int_t iparent) {fIparent=iparent;}
+  void   SetPrimary(Int_t primary)  {fPrimary=primary;}
+
   Bool_t operator == (AliEMCALHit const &rValue) const;
   AliEMCALHit operator + (const AliEMCALHit& rValue);
   
@@ -53,10 +57,10 @@ public:
   Int_t          fId;        // Absolute Id number EMCAL segment
   Float_t        fELOS;      // Energy deposited
   Int_t          fPrimary;   // Primary particles at the origin of the hit
-  Float_t        fPx;      // Primary partical enetrence momentum/energy
-  Float_t        fPy;      // Primary partical enetrence momentum/energy
-  Float_t        fPz;      // Primary partical enetrence momentum/energy
-  Float_t        fPe;      // Primary partical enetrence momentum/energy
+  Float_t        fPx;      // Primary particle entrance momentum/energy
+  Float_t        fPy;      // Primary particle entrance momentum/energy
+  Float_t        fPz;      // Primary particle entrance momentum/energy
+  Float_t        fPe;      // Primary particle entrance momentum/energy
   Int_t          fIparent;   // Parent particle that entered emcal
   Float_t        fIenergy;   // Initial energy of parent particle that enterred the emcal
   Float_t        fTime ;      // Time of the energy deposition