Preprocessor with new DA

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

diff --git a/FMD/AliFMDReconstructor.h b/FMD/AliFMDReconstructor.h
index 53a58384460ec315d3f8183b034e5d5c4a0e9da2..f0f2fc5b145387202918f73ed133ddd7d5ebdd32 100644 (file)
--- a/FMD/AliFMDReconstructor.h
+++ b/FMD/AliFMDReconstructor.h
@@ -25,12 +25,13 @@
 # include <AliReconstructor.h>
 #endif
 
+#include "AliLog.h"
+
 //____________________________________________________________________
 class TTree;
 class TClonesArray;
 class AliFMDDigit;
 class AliRawReader;
-class AliRunLoader;
 class AliESDEvent;
 class AliESDFMD;
 class TH1;
@@ -60,7 +61,7 @@ public:
       initialized (meaning that the calibration parameters is read
       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; }
@@ -71,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
@@ -82,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
@@ -91,6 +91,9 @@ public:
   */
   virtual void   FillESD(TTree* digitsTree, TTree* clusterTree, 
                         AliESDEvent* esd) const;
+  /** Forwards to above member function */
+  virtual void   FillESD(AliRawReader*, TTree* clusterTree, 
+                        AliESDEvent* esd) const;
   /** Not used */
   virtual void   SetESD(AliESDEvent* esd) { fESD = esd; }
   /** Set the noise factor 
@@ -191,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*, AliESDEvent*) const;
-  /** Hide base classes unused function */
-  void FillESD(AliRunLoader*, AliESDEvent*) const;
-  /** Hide base classes unused function */
-  void FillESD(AliRunLoader*, AliRawReader*, AliESDEvent*) const;
-  
-  ClassDef(AliFMDReconstructor, 2)  // class for the FMD reconstruction
+   
+  ClassDef(AliFMDReconstructor, 3)  // class for the FMD reconstruction
 }; 
 #endif
 //____________________________________________________________________