X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSCpvRecPoint.h;h=799f46113e5675785517c6ddfdee4b9a2b2acdbd;hb=051db1cf605112d1929409ba9f98f3b4f08d410b;hp=2b14c918283c69f34529b6928177290df5a47830;hpb=88cb7938ca21d4a80991d4e7aa564008c29340f7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSCpvRecPoint.h b/PHOS/AliPHOSCpvRecPoint.h
index 2b14c918283..799f46113e5 100644
--- a/PHOS/AliPHOSCpvRecPoint.h
+++ b/PHOS/AliPHOSCpvRecPoint.h
@@ -5,24 +5,36 @@
 
 /* $Id$ */
 
+/* History of cvs commits:
+ *
+ * $Log$
+ * Revision 1.20  2007/03/06 06:47:28  kharlov
+ * DP:Possibility to use actual vertex position added
+ *
+ * Revision 1.19  2006/08/28 10:01:56  kharlov
+ * Effective C++ warnings fixed (Timur Pocheptsov)
+ *
+ * Revision 1.18  2005/05/28 14:19:04  schutz
+ * Compilation warnings fixed by T.P.
+ *
+ */
+
 //_________________________________________________________________________
 //  RecPoint implementation for PHOS-CPV
 //  An CpvRecPoint is a cluster of digits   
-//*-- Author: Yuri Kharlov
+//-- Author: Yuri Kharlov
 //  (after Dmitri Peressounko (RRC KI & SUBATECH))
 //  30 October 2000 
 // --- ROOT system ---
 
-#include "TObject.h"
-#include "TArrayI.h"
+//#include "TObject.h"
+//#include "TArrayI.h"
  
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
-#include "AliPHOSDigit.h"
 #include "AliPHOSEmcRecPoint.h"
-#include "AliPHOSGeometry.h"
 
 class AliPHOSCpvRecPoint : public AliPHOSEmcRecPoint  {
 
@@ -30,32 +42,22 @@ public:
 
   AliPHOSCpvRecPoint() ;
   AliPHOSCpvRecPoint(const char * opt) ;
-  AliPHOSCpvRecPoint(const AliPHOSCpvRecPoint & rp) {
-    // cpy ctor requested by Coding Convention 
-    // but not yet needed
-    assert(0==1) ; 
-  } 
- 
+
   virtual ~AliPHOSCpvRecPoint() ;  
 
   Int_t  Compare(const TObject * obj) const;                 // method for sorting  
-  void   EvalAll(Float_t logWeight,TClonesArray * digits) ;
-  void   EvalLocalPosition(Float_t logWeight,TClonesArray * digits ) ;  
+  virtual void EvalAll(TClonesArray * digits) ;
+  virtual void EvalAll(Float_t logWeight, TVector3 &vtx, TClonesArray * digits) ;
+  void   EvalLocalPosition(Float_t logWeight, TVector3 &vtx, TClonesArray * digits, TVector3 &vInc) ;
   void   EvalClusterLengths(TClonesArray * digits) ;
 
-  virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) const ; 
+  virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py) /*const*/ ; 
 
   void   GetClusterLengths(Int_t &lengX, Int_t &lengZ) const {lengX = fLengX ;lengZ = fLengZ ;}
   Bool_t IsEmc(void) const {return kFALSE ; }        // tells that this is not a EMC
   Bool_t IsCPV(void) const {return kTRUE  ; }        // true if the recpoint is in CPV
   Bool_t IsSortable() const { return kTRUE ; }    // tells that this is a sortable object
-  void   Print(Option_t * opt = "void") ; 
-
-  AliPHOSCpvRecPoint & operator = (const AliPHOSCpvRecPoint & rvalue)  {
-    // assignement operator requested by coding convention but not needed
-    assert(0==1) ;
-    return *this ; 
-  }
+  void   Print(const Option_t * = "") const ; 
 
  protected: