Modified destructor of AliMuonForwardTrack

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

diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h
index 62dafb8273a56941b9ddc55cee73ed7646ef7777..fe3c3c3f26e18fd708980085199f74e36d4f4992 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.h
+++ b/PHOS/AliPHOSEmcRecPoint.h
@@ -23,7 +23,7 @@
 //  RecPoint implementation for PHOS-EMC 
 //  An EmcRecPoint is a cluster of digits   
 //           
-//*-- Author: Dmitri Peressounko (RRC KI & SUBATECH)
+//-- Author: Dmitri Peressounko (RRC KI & SUBATECH)
 
 // --- ROOT system ---
 
@@ -44,15 +44,18 @@ public:
  
   virtual ~AliPHOSEmcRecPoint() ;  
 
+  virtual void Clear(const Option_t* /*option*/ ="") { delete[] fEnergyList; fEnergyList=0; AliPHOSRecPoint::Clear(); }
+
   //This virtual function has signature different from AliPHOSRecPoint::AddDigit
   //it hides, not overrides. using - declaration should fix the problem, at least for
   //g++
-  using AliPHOSRecPoint::AddDigit;
-  virtual void  AddDigit(AliPHOSDigit & digit, Float_t Energy) ;          // add a digit to the digits list  
+//  using AliPHOSRecPoint::AddDigit;
+  virtual void  AddDigit(AliPHOSDigit & digit, Float_t Energy, Float_t time=0.) ;          // add a digit to the digits list  
   Int_t       Compare(const TObject * obj) const;                         // method for sorting  
 
-  virtual void  EvalAll(Float_t logWeight, TClonesArray * digits) ; //Those tasks which can be done without vertex
+  virtual void  EvalAll(TClonesArray * digits) ; //Those tasks which can be done without vertex
   virtual void  EvalAll(Float_t logWeight, TVector3 &vtx, TClonesArray * digits) ;
+          void  EvalCoreEnergy(Float_t logWeight, Float_t coreRadius, TClonesArray * digits) ;             
 
   //in base class this functions is non-const
   virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py) /*const*/; 
@@ -79,7 +82,7 @@ public:
   Bool_t      IsEmc(void) const { return kTRUE ; }                 // true if the recpoint is in EMC
   Bool_t      IsSortable() const {return kTRUE ; }                 // says that emcrecpoints are sortable objects 
   void        Print(Option_t *)const ; 
-  void        Purify(Float_t threshold) ;                          //Removes digits below threshold
+  void        Purify(Float_t threshold, const TClonesArray * digits) ;                          //Removes digits below threshold
 
   Float_t     GetM2x()   const {return fM2x;  } // Get second X-moment
   Float_t     GetM2z()   const {return fM2z;  } // Get second Z-moment
@@ -90,10 +93,10 @@ public:
   Float_t     GetDistanceToBadCrystal() const {return fDistToBadCrystal;}
   void        SetDistanceToBadCrystal(Float_t dist) {fDistToBadCrystal=dist;}
 
-  AliPHOSEmcRecPoint & operator = (const AliPHOSEmcRecPoint & /*rvalue*/)  { return *this ; }
+private:
+  AliPHOSEmcRecPoint & operator = (const AliPHOSEmcRecPoint & /*rvalue*/) {return *this;}
 
- protected:
-          void  EvalCoreEnergy(Float_t logWeight,TClonesArray * digits) ;             
+protected:
   virtual void  EvalLocalPosition(Float_t logWeight, TVector3 &vtx, TClonesArray * digits, TVector3 &vInc) ;// computes the position in the PHOS module 
   virtual void  EvalDispersion(Float_t logWeight, TClonesArray * digits, TVector3 &vInc) ;   // computes the dispersion of the shower
   virtual void  EvalElipsAxis(Float_t logWeight, TClonesArray * digits, TVector3 &vInc );   // computes the axis of shower ellipsoide