X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSEmcRecPoint.h;h=2a870e5314ccda406260a7d40055c843949e5c7e;hb=e690d4d0e7e285877ba06aa026c25491e293dbf5;hp=82565faa52ef9c252fbdb98d76d0f96b3e375ce1;hpb=91daaf2499259446d044ba62d86faf4ba0db72c1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h
index 82565faa52e..2a870e5314c 100644
--- a/PHOS/AliPHOSEmcRecPoint.h
+++ b/PHOS/AliPHOSEmcRecPoint.h
@@ -8,6 +8,12 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.36  2007/04/05 10:18:58  policheh
+ * Introduced distance to nearest bad crystal.
+ *
+ * Revision 1.35  2007/03/06 06:47:28  kharlov
+ * DP:Possibility to use actual vertex position added
+ *
  * Revision 1.34  2005/05/28 14:19:04  schutz
  * Compilation warnings fixed by T.P.
  *
@@ -17,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 ---
 
@@ -38,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*/; 
@@ -73,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
@@ -81,14 +90,18 @@ public:
   Float_t     GetM4z()   const {return fM4z;  } // Get forth  Z-moment
   Float_t     GetPhixe() const {return fPhixe;} // Get angle between center gravity and eigen vector
 
-  AliPHOSEmcRecPoint & operator = (const AliPHOSEmcRecPoint & /*rvalue*/)  { return *this ; }
+  Float_t     GetDistanceToBadCrystal() const {return fDistToBadCrystal;}
+  void        SetDistanceToBadCrystal(Float_t dist) {fDistToBadCrystal=dist;}
 
- protected:
-          void  EvalCoreEnergy(Float_t logWeight,TClonesArray * digits) ;             
+private:
+  AliPHOSEmcRecPoint & operator = (const AliPHOSEmcRecPoint & /*rvalue*/) {return *this;}
+
+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
           void  EvalMoments(Float_t logWeight, TClonesArray * digits, TVector3 &vInc );     // computes shower moments
+  virtual void  EvalPrimaries(TClonesArray * digits) ;
           void  EvalTime( TClonesArray * digits );
   virtual Bool_t AreNeighbours(AliPHOSDigit * digit1, AliPHOSDigit * digit2 ) const ;
 
@@ -104,10 +117,13 @@ public:
   Float_t fM3x;               // Third  moment along X axis
   Float_t fM4z;               // Forth  moment along Z axis
   Float_t fPhixe;             // Angle between center-gravity vector and eigen vector
+  Float_t fDistToBadCrystal;  // Distance to nearest bad crystal
 
   Int_t fDebug;               //! debug level (0 - no output)
-  
-  ClassDef(AliPHOSEmcRecPoint,2)  // EMC RecPoint (cluster)
+   Long64_t fInstCount;
+  static Long64_t fgInstCount;
+ 
+  ClassDef(AliPHOSEmcRecPoint,4)  // EMC RecPoint (cluster)
 
 };