X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSRecPoint.h;h=765e02e78af2bc9158c99668493a1d44a1192176;hb=7e6ee5e39d1f413890d7227279bc5da9fda26849;hp=489c0b7c1b85c7b0894ac1a1aa98312a4e1d9c5b;hpb=b73f246d92ad05600f8f4134e117aacee0c00850;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h
index 489c0b7c1b8..765e02e78af 100644
--- a/PHOS/AliPHOSRecPoint.h
+++ b/PHOS/AliPHOSRecPoint.h
@@ -2,28 +2,23 @@
 #define ALIPHOSRECPOINT_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
-
 //_________________________________________________________________________
 //  Base Class for PHOS Reconstructed Points  
-//                  
+//  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 AliPHOSGeometry;
+class AliPHOSDigit ; 
 
 class AliPHOSRecPoint : public AliRecPoint {
 
@@ -32,53 +27,44 @@ 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 
+  AliPHOSRecPoint(const AliPHOSRecPoint & rp) : AliRecPoint(rp) {
+    Fatal("Cpy ctor", "not implemented") ; } 
   
   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(TObject * obj) { 
-    // check why this is done
-    assert(0==1) ; return 1 ; 
-  }   
+  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 Int_t   GetPHOSMod(void) ;
-  virtual Int_t * GetPrimaries(Int_t & number) ;
-  virtual Bool_t  IsEmc(void){
-    // says that this is a EMC
-    return kTRUE ;
-  } 
+  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 ; }
+  virtual Bool_t  IsEmc(void)const { return kTRUE ;  } 
   virtual Bool_t  IsSortable() const { 
     // tells that this is a sortable object
     return kTRUE ; 
   }  
   virtual void    Paint(Option_t * option="");
-  virtual void    Print(Option_t * opt = "void") {
+  virtual void    Print(Option_t *) const {
     // Print prototype
   } 
 
-  AliPHOSRecPoint & operator = (const AliPHOSRecPoint & rvalue)  {
-    // assignement operator requested by coding convention
-    // but not needed
-    assert(0==1) ;
-    return *this ; 
+  AliPHOSRecPoint & operator = (const AliPHOSRecPoint & )  {
+    Fatal("operator = ", "not implemented") ;  return *this ; 
   }
-
 protected:
   
   Int_t fPHOSMod ;      // PHOS Module number in which the RecPoint is found
-//    AliPHOSGeometry * fGeom ; // pointer to the PHOS geometry class
   
   ClassDef(AliPHOSRecPoint,1) // RecPoint for PHOS (Base Class)