START positions

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

diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h
index de2466be50903f19b88c1c8d7c1cbbf4ae374a82..6e9239910a8e56de191268a63ea8215e93d2af65 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.h
+++ b/PHOS/AliPHOSEmcRecPoint.h
@@ -5,6 +5,11 @@
 
 /* $Id$ */
 
+/* History of cvs commits:
+ *
+ * $Log$
+ */
+
 //_________________________________________________________________________
 //  RecPoint implementation for PHOS-EMC 
 //  An EmcRecPoint is a cluster of digits   
@@ -13,14 +18,11 @@
 
 // --- ROOT system ---
 
-//#include "TObject.h"
-#include "TArrayI.h"
- 
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
-#include "AliPHOSDigit.h"
+//#include "AliPHOSDigit.h"
 #include "AliPHOSRecPoint.h"
 
 class AliPHOSEmcRecPoint : public AliPHOSRecPoint  {
@@ -33,12 +35,17 @@ public:
  
   virtual ~AliPHOSEmcRecPoint() ;  
 
+  //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  
   Int_t       Compare(const TObject * obj) const;                         // method for sorting  
 
   virtual void  EvalAll(Float_t logWeight,TClonesArray * digits) ;
 
-  virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py) const; 
+  //in base class this functions is non-const
+  virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py) /*const*/; 
 
   Float_t         GetCoreEnergy()const {return fCoreEnergy ;}
   virtual Float_t GetDispersion()const {return fDispersion ;}
@@ -48,7 +55,7 @@ public:
   Float_t     GetMaximalEnergy(void) const ;                       // get the highest energy in the cluster
   Int_t       GetMaximumMultiplicity() const {return fMaxDigit ;}  // gets the maximum number of digits allowed
   Int_t       GetMultiplicity(void) const { return fMulDigit ; }   // gets the number of digits making this recpoint
-  Int_t       GetMultiplicityAtLevel(const Float_t level) const ;  // computes multiplicity of digits with 
+  Int_t       GetMultiplicityAtLevel(Float_t level) const ;  // computes multiplicity of digits with 
                                                                    // energy above relative level
   Short_t     GetNExMax(void) const {return fNExMax ;}             // Number of maxima found in cluster in unfolding:
                                                                    // 0: was no unfolging
@@ -61,7 +68,7 @@ public:
   Float_t     GetTime(void) const{return  fTime ; } 
   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 * opt = "void")const ; 
+  void        Print(Option_t *)const ; 
   void        Purify(Float_t threshold) ;                          //Removes digits below threshold
 
   Float_t     GetM2x()   const {return fM2x;  } // Get second X-moment
@@ -70,7 +77,7 @@ 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 ; }
+  AliPHOSEmcRecPoint & operator = (const AliPHOSEmcRecPoint & /*rvalue*/)  { return *this ; }
 
  protected:
           void  EvalCoreEnergy(Float_t logWeight,TClonesArray * digits) ;