effc++ warnings

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

diff --git a/PHOS/AliPHOSReconstructor.h b/PHOS/AliPHOSReconstructor.h
index 8556584f725c4a268852b9abbd14fdf45c5ffaff..28cec7dd9452ce78cb62b41352d89cb6faa6244e 100644 (file)
--- a/PHOS/AliPHOSReconstructor.h
+++ b/PHOS/AliPHOSReconstructor.h
@@ -8,6 +8,22 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.15  2007/10/01 20:24:08  kharlov
+ * Memory leaks fixed
+ *
+ * Revision 1.14  2007/09/26 14:22:18  cvetan
+ * Important changes to the reconstructor classes. Complete elimination of the run-loaders, which are now steered only from AliReconstruction. Removal of the corresponding Reconstruct() and FillESD() methods.
+ *
+ * Revision 1.13  2007/08/30 10:40:27  cvetan
+ * Minor
+ *
+ * Revision 1.12  2007/08/28 12:55:08  policheh
+ * Loaders removed from the reconstruction code (C.Cheshkov)
+ *
+ * Revision 1.11  2007/07/24 17:20:35  policheh
+ * Usage of RecoParam objects instead of hardcoded parameters in reconstruction.
+ * (See $ALICE_ROOT/PHOS/macros/BeamTest2006/RawReconstruction.C).
+ *
  * Revision 1.10  2007/07/11 13:43:30  hristov
  * New class AliESDEvent, backward compatibility with the old AliESD (Christian)
  *
@@ -21,15 +37,18 @@
 
 //_________________________________________________________________________
 //  Wrapping class for reconstruction
-//*--
-//*-- Author: Yves Schutz (SUBATECH) 
+//--
+//-- Author: Yves Schutz (SUBATECH) 
 // Reconstruction class. Redesigned from the old AliReconstructionner class and 
 // derived from STEER/AliReconstructor. 
 //_________________________________________________________________________
 
 // --- ROOT system ---
 
+#include <Riostream.h>
 #include "AliReconstructor.h" 
+#include "AliPHOSRecoParamEmc.h"
+#include "AliPHOSRecoParamCpv.h"
 class AliPHOSDigitizer ;
 class AliPHOSClusterizer ;
 class AliPHOSTrackSegmentMaker ;
@@ -38,6 +57,7 @@ class AliPHOSSDigitizer ;
 class AliESDEvent ;
 class AliRawReader; 
 class AliPHOSRecoParam;
+class AliPHOSGeometry;
 
 // --- Standard library ---
 
@@ -48,22 +68,28 @@ class AliPHOSReconstructor : public AliReconstructor {
 public:
 
   AliPHOSReconstructor() ; //ctor            
-  AliPHOSReconstructor(const AliPHOSReconstructor & rec) : AliReconstructor(rec) {
+  AliPHOSReconstructor(const AliPHOSReconstructor & rec) :
+    AliReconstructor(rec),
+    fGeom(rec.fGeom)
+    {
     // cpy ctor: 
     // requested by the Coding Convention
     Fatal("cpy ctor", "not implemented") ;
   }
-  ~AliPHOSReconstructor() ; //dtor            
+  virtual ~AliPHOSReconstructor() ; //dtor            
+
   static void                SetDebug()   { fgDebug = kTRUE ; }
   static void                ResetDebug() { fgDebug = kFALSE ; }
   static Bool_t              Debug() { return fgDebug ; }
-  AliTracker *CreateTracker(AliRunLoader* runLoader) const;
+  AliTracker *CreateTracker() const;
   using AliReconstructor::FillESD;
-  virtual void               FillESD(AliRunLoader* runLoader, AliESDEvent* esd) const ;
-  virtual void FillESD(AliRunLoader* runLoader,AliRawReader* rawReader,AliESDEvent* esd) const;
+  virtual void               FillESD(TTree* digitsTree, TTree* clustersTree, 
+                                    AliESDEvent* esd) const;
   using AliReconstructor::Reconstruct;
-  virtual void               Reconstruct(AliRunLoader* runLoader) const ;
-  virtual void               Reconstruct(AliRunLoader* runLoader, AliRawReader * rawreader) const ;
+  virtual void               Reconstruct(TTree* digitsTree, TTree* clustersTree) const;
+
+  virtual Bool_t             HasDigitConversion() const {return kTRUE;};
+  virtual void               ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const;
 
   AliPHOSReconstructor & operator = (const AliPHOSReconstructor & /*rvalue*/)  {
     // assignement operator requested by coding convention but not needed
@@ -74,16 +100,29 @@ public:
   void SetRecoParamEmc(AliPHOSRecoParam * param){ fgkRecoParamEmc = param;}
   void SetRecoParamCpv(AliPHOSRecoParam * param){ fgkRecoParamCpv = param;}
 
-  static const AliPHOSRecoParam* GetRecoParamEmc(){ return fgkRecoParamEmc;}
-  static const AliPHOSRecoParam* GetRecoParamCpv(){ return fgkRecoParamCpv;}
+  static const AliPHOSRecoParam* GetRecoParamEmc(){ 
+    if (!fgkRecoParamEmc) {
+      cerr<<"The Reconstruction parameters for EMC nonitialized - Used default one"<<endl;
+      fgkRecoParamEmc = AliPHOSRecoParamEmc::GetEmcDefaultParameters();
+    }
+    return fgkRecoParamEmc;
+  }
+  static const AliPHOSRecoParam* GetRecoParamCpv(){
+    if (!fgkRecoParamCpv) {
+      cerr<<"The Reconstruction parameters for CPV nonitialized - Used default one"<<endl;
+      fgkRecoParamCpv = AliPHOSRecoParamCpv::GetCpvDefaultParameters();
+    }
+    return fgkRecoParamCpv;
+  }
 
 private:
   
   static Bool_t fgDebug ; //! verbosity controller
-  static AliPHOSRecoParam*   fgkRecoParamEmc; // reconstruction parameters for EMC
-  static AliPHOSRecoParam*   fgkRecoParamCpv; // reconstruction parameters for EMC
+  static AliPHOSRecoParam *fgkRecoParamEmc; // reconstruction parameters for EMC
+  static AliPHOSRecoParam *fgkRecoParamCpv; // reconstruction parameters for EMC
+  AliPHOSGeometry         *fGeom;           // pointer to the PHOS geometry
 
-  ClassDef(AliPHOSReconstructor,2)  // Reconstruction algorithm class (Base Class)
+  ClassDef(AliPHOSReconstructor,4)  // PHOS Reconstruction class
 
 };