Fixing ompilation warnings

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

diff --git a/PHOS/AliPHOSReconstructor.h b/PHOS/AliPHOSReconstructor.h
index 14b1c7a52923eed82c4b983ae1f38cadeaafc03f..54db25bda59016e951d63b958d5890592bc2ec06 100644 (file)
--- a/PHOS/AliPHOSReconstructor.h
+++ b/PHOS/AliPHOSReconstructor.h
@@ -47,8 +47,7 @@
 
 #include <Riostream.h>
 #include "AliReconstructor.h" 
-#include "AliPHOSRecoParamEmc.h"
-#include "AliPHOSRecoParamCpv.h"
+#include "AliPHOSRecoParam.h"
 class AliPHOSDigitizer ;
 class AliPHOSClusterizer ;
 class AliPHOSClusterizerv1 ;
@@ -59,6 +58,7 @@ class AliESDEvent ;
 class AliRawReader; 
 class AliPHOSRecoParam;
 class AliPHOSGeometry;
+class AliPHOSCalibData ;
 
 // --- Standard library ---
 
@@ -71,7 +71,10 @@ public:
   AliPHOSReconstructor() ; //ctor            
   AliPHOSReconstructor(const AliPHOSReconstructor & rec) :
     AliReconstructor(rec),
-    fGeom(rec.fGeom)
+    fGeom(rec.fGeom),
+    fClusterizer(rec.fClusterizer),
+    fTSM(rec.fTSM),
+    fPID(rec.fPID)
     {
     // cpy ctor: 
     // requested by the Coding Convention
@@ -91,6 +94,7 @@ public:
 
   virtual Bool_t             HasDigitConversion() const {return kTRUE;};
   virtual void               ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const;
+  virtual Float_t            Calibrate(Float_t amp, Int_t absId) const ;
 
   AliPHOSReconstructor & operator = (const AliPHOSReconstructor & /*rvalue*/)  {
     // assignement operator requested by coding convention but not needed
@@ -98,37 +102,21 @@ public:
     return *this ; 
   }
   
-  static void SetRecoParamEmc(AliPHOSRecoParam * param){ fgkRecoParamEmc = param;}
-  static void SetRecoParamCpv(AliPHOSRecoParam * param){ fgkRecoParamCpv = param;}
-
-  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;
-  }
+  static const AliPHOSRecoParam* GetRecoParam() {
+    return dynamic_cast<const AliPHOSRecoParam*>(AliReconstructor::GetRecoParam(4)); }
 
 private:
   
   static Bool_t fgDebug ; //! verbosity controller
-  static AliPHOSRecoParam  *fgkRecoParamEmc; // reconstruction parameters for EMC
-  static AliPHOSRecoParam  *fgkRecoParamCpv; // reconstruction parameters for EMC
   AliPHOSGeometry          *fGeom;           // pointer to the PHOS geometry
   AliPHOSClusterizerv1     *fClusterizer;    //! PHOS clusterizer
   AliPHOSTrackSegmentMaker *fTSM;            //! PHOS TrackSegmentMaker
   AliPHOSPID               *fPID;            //! PHOS PID maker
   static TClonesArray      *fgDigitsArray;   //! Array of PHOS digits
   static TObjArray         *fgEMCRecPoints;  //! Array of EMC rec.points
+  static AliPHOSCalibData * fgCalibData ;    //! Calibration database if aval.
 
-  ClassDef(AliPHOSReconstructor,7)  // PHOS Reconstruction class
+  ClassDef(AliPHOSReconstructor,8)  // PHOS Reconstruction class
 
 };