Merge remote-tracking branch 'origin/master' into mergingFlat

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

diff --git a/PHOS/AliPHOSHit.h b/PHOS/AliPHOSHit.h
index c77d45084f4ecf3c62bdc620887b60dd1515c3ed..d44ff7def2d70a5bad4f5a57926c7f748e02a7b3 100644 (file)
--- a/PHOS/AliPHOSHit.h
+++ b/PHOS/AliPHOSHit.h
@@ -18,18 +18,18 @@
 
 // --- Standard library ---
 
-#include <iostream.h>
 
 class AliPHOSHit : public AliHit {
 
-public:
-
-  AliPHOSHit() {
+//   friend ostream& operator << (ostream&, const AliPHOSHit&) ;
+  
+ public:
+  
+  AliPHOSHit() : fId(0),fELOS(0),fTime(0) {
     // default ctor 
   }
   AliPHOSHit(const AliPHOSHit & hit) ; 
-  AliPHOSHit(Int_t primary, Int_t id, Float_t *hits) ;
-  AliPHOSHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t id, Float_t *hits) ;
+  AliPHOSHit(Int_t shunt, Int_t tracknumber, Int_t id, Float_t *hits);
   virtual ~AliPHOSHit(void) {
     // dtor 
   }  
@@ -44,19 +44,27 @@ public:
   }
   Int_t   GetPrimary(void)  const { 
     // returns the primary particle id at the origine of this hit 
-    return fPrimary ; 
+    return fTrack ; 
+  }
+
+  Float_t GetTime(void)     const {
+    // returns the time of the first energy deposition
+    return fTime ;
   }
 
+
   Bool_t operator == (AliPHOSHit const &rValue) const ;
-  AliPHOSHit operator + (const AliPHOSHit& rValue) const ;
+  AliPHOSHit operator + (const AliPHOSHit& rValue) ;
 
-  friend ostream& operator << (ostream&, const AliPHOSHit&) ;
+
+private:
+  AliPHOSHit & operator = (const AliPHOSHit & /*hit*/);
 
 private:
 
-  Int_t     fId ;        // Absolute Id number of PHOS Xtal or PPSD pad
-  Float_t   fELOS ;      // Energy deposited
-  Int_t     fPrimary ;   // Primary particles at the origine of the hit
+  Int_t          fId ;        // Absolute Id number of PHOS Xtal or PPSD pad
+  Float_t        fELOS ;      // Energy deposited
+  Float_t        fTime ;      // Time of the energy deposition
 
   ClassDef(AliPHOSHit,1)  // Hit for PHOS