Protection against events with no or insufficient number of clusters. Plus some chang...

[u/mrichter/AliRoot.git] / FMD / AliFMDReconstructor.h

diff --git a/FMD/AliFMDReconstructor.h b/FMD/AliFMDReconstructor.h
index a2059d3ad8c95409481a52ba1df4ed0e684502ac..f0f2fc5b145387202918f73ed133ddd7d5ebdd32 100644 (file)
--- a/FMD/AliFMDReconstructor.h
+++ b/FMD/AliFMDReconstructor.h
@@ -25,13 +25,14 @@
 # include <AliReconstructor.h>
 #endif
 
+#include "AliLog.h"
+
 //____________________________________________________________________
 class TTree;
 class TClonesArray;
 class AliFMDDigit;
 class AliRawReader;
-class AliRunLoader;
-class AliESD;
+class AliESDEvent;
 class AliESDFMD;
 class TH1;
 
@@ -58,11 +59,9 @@ public:
       manager, and finds the local to global transformations from the
       geometry.   The calibration parameter manager is also
       initialized (meaning that the calibration parameters is read
-      from CDB).   Next, we try to get some information about the run
-      from the run loader passed. 
-      @param runLoader Run loader to use to load and store data. 
+      from CDB).
   */
-  virtual void   Init(AliRunLoader* runLoader);
+  virtual void   Init();
   /** Flag that we can convert raw data into digits. 
       @return always @c true */
   virtual Bool_t HasDigitConversion() const { return kTRUE; }
@@ -73,9 +72,6 @@ public:
       @param reader     Raw reader. 
       @param digitsTree Tree to store read digits in. */
   virtual void   ConvertDigits(AliRawReader* reader, TTree* digitsTree) const;
-  /** Flag that we can do one-event reconstruction. 
-      @return always @c true  */
-  virtual Bool_t HasLocalReconstruction() const { return kTRUE; }
   /** Reconstruct one event from the digits passed in @a digitsTree.
       The member function creates AliFMDRecPoint objects and stores
       them on the output tree @a clusterTree.  An FMD ESD object is
@@ -84,6 +80,8 @@ public:
       @param digitsTree  Tree holding the digits of this event
       @param clusterTree Tree to store AliFMDRecPoint objects in. */
   virtual void   Reconstruct(TTree* digitsTree, TTree* clusterTree) const;
+  /** Not used */
+  virtual void   Reconstruct(AliRawReader *, TTree*) const;
   /** Put in the ESD data, the FMD ESD data.  The object created by
       the Reconstruct member function is copied to the ESD object. 
       @param digitsTree   Tree of digits for this event - not used
@@ -92,9 +90,12 @@ public:
       @param esd ESD object to store data in. 
   */
   virtual void   FillESD(TTree* digitsTree, TTree* clusterTree, 
-                        AliESD* esd) const;
+                        AliESDEvent* esd) const;
+  /** Forwards to above member function */
+  virtual void   FillESD(AliRawReader*, TTree* clusterTree, 
+                        AliESDEvent* esd) const;
   /** Not used */
-  virtual void   SetESD(AliESD* esd) { fESD = esd; }
+  virtual void   SetESD(AliESDEvent* esd) { fESD = esd; }
   /** Set the noise factor 
       @param f Factor to use */
   virtual void SetNoiseFactor(Float_t f=3) { fNoiseFactor = f; }
@@ -185,8 +186,7 @@ protected:
   Float_t               fNoiseFactor;   // Factor of noise to check
   Bool_t                fAngleCorrect;  // Whether to angle correct
   mutable Vertex_t      fVertexType;    // What kind of vertex we got
-  AliRunLoader*         fRunLoader;     // Run loader passed to Init  
-  AliESD*               fESD;           // ESD object(?)
+  AliESDEvent*          fESD;           // ESD object(?)
   Bool_t                fDiagnostics;   // Wheter to do diagnostics
   TH1*                  fDiagStep1;    // Diagnostics histogram
   TH1*                  fDiagStep2;    // Diagnostics histogram
@@ -194,20 +194,8 @@ protected:
   TH1*                  fDiagStep4;    // Diagnostics histogram
   TH1*                  fDiagAll;      // Diagnostics histogram
 private:
-  /** Hide base classes unused function */
-  void Reconstruct(AliRawReader*, TTree*) const;
-  /** Hide base classes unused function */
-  void Reconstruct(AliRunLoader*) const;
-  /** Hide base classes unused function */
-  void Reconstruct(AliRunLoader*, AliRawReader*) const;
-  /** Hide base classes unused function */
-  void FillESD(AliRawReader*, TTree*, AliESD*) const;
-  /** Hide base classes unused function */
-  void FillESD(AliRunLoader*, AliESD*) const;
-  /** Hide base classes unused function */
-  void FillESD(AliRunLoader*, AliRawReader*, AliESD*) const;
-  
-  ClassDef(AliFMDReconstructor, 0)  // class for the FMD reconstruction
+   
+  ClassDef(AliFMDReconstructor, 3)  // class for the FMD reconstruction
 }; 
 #endif
 //____________________________________________________________________