X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSRecPoint.h;h=b3951a53bf656de6753e89ddd61fff5ddf0bb1e0;hb=f11338014d904ef7b22d9b6b399f0b10c433460b;hp=31192d46589965811ecf3c17695a94059714d9e5;hpb=baef0810d8890cfbd9ea3a8e766812ca08a0a589;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h
index 31192d46589..b3951a53bf6 100644
--- a/PHOS/AliPHOSRecPoint.h
+++ b/PHOS/AliPHOSRecPoint.h
@@ -7,21 +7,18 @@
 //  A recpoint being equivalent to a cluster in encal terminology                 
 //*-- Author: Gines Martinez (SUBATECH)
 
-#include <assert.h>
-
 // --- ROOT system ---
 
-#include "TMarker.h"
-#include "TGraph.h"
-#include "TPaveText.h"
-
+//#include "TMarker.h"
+//#include "TGraph.h"
+//#include "TPaveText.h"
+  class TClonesArray ;
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
 #include "AliRecPoint.h"
-#include "AliPHOSDigit.h"
-#include "AliPHOSGeometry.h"
+class AliPHOSDigit ; 
 
 class AliPHOSRecPoint : public AliRecPoint {
 
@@ -30,27 +27,23 @@ class AliPHOSRecPoint : public AliRecPoint {
   typedef TObjArray RecPointsList ; 
 
   AliPHOSRecPoint() ;                   // ctor         
-  AliPHOSRecPoint(const AliPHOSRecPoint & rp) {
-    // cpy ctor requested by Coding Convention 
-    // but not yet needed
-    assert(0==1) ; 
-  } 
+  AliPHOSRecPoint(const char * opt) ;   // ctor 
   
   virtual ~AliPHOSRecPoint(){
     // dtor
   }
   virtual  void   AddDigit(AliDigitNew &){
-    // do not use this definition but the one below
-    assert(0==1) ; 
+   Fatal("AddDigit", "use AddDigit(AliPHOSDigit & digit, Float_t Energy)") ; 
   }
   virtual  void   AddDigit(AliPHOSDigit & digit, Float_t Energy) = 0 ; 
   virtual Int_t   Compare(const TObject * obj) const = 0 ;   
   virtual Int_t   DistancetoPrimitive(Int_t px, Int_t py);
   virtual void    Draw(Option_t * option="") ;
   virtual void    ExecuteEvent(Int_t event, Int_t px, Int_t py) ;
-  virtual void    EvalAll(Float_t logWeight,TClonesArray * digits) ;  
+  void    EvalAll(TClonesArray * digits) ;  
   virtual void    EvalPHOSMod(AliPHOSDigit * digit) ;  
   virtual void    EvalPrimaries(TClonesArray * digits) ;  
+  virtual void    GetGlobalPosition(TVector3 & gpos, TMatrixF & gmat) const ; // return global position in ALICE
   virtual Int_t   GetPHOSMod(void) const {return fPHOSMod ; }
   virtual Int_t * GetPrimaries(Int_t & number) const {number = fMulTrack ; 
                                                       return fTracksList ; }
@@ -60,16 +53,10 @@ class AliPHOSRecPoint : public AliRecPoint {
     return kTRUE ; 
   }  
   virtual void    Paint(Option_t * option="");
-  virtual void    Print(Option_t * opt = "void") const {
+  virtual void    Print(Option_t *) const {
     // Print prototype
   } 
 
-  AliPHOSRecPoint & operator = (const AliPHOSRecPoint & )  {
-    // assignement operator requested by coding convention but not needed
-    assert(0==1) ;
-    return *this ; 
-  }
-
 protected:
   
   Int_t fPHOSMod ;      // PHOS Module number in which the RecPoint is found