X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSClusterizer.h;h=1522d3760a700d8e7abee1c9f73f981a073e6c88;hb=9dcbfbd8e8ee96bd44ae6f4bf2ed32431ec82b95;hp=f424056f30dbb6f86236224c5125f4ea34d44fd5;hpb=0378398cbb852c672c3f6d5e357a69d1f3bf478a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSClusterizer.h b/PHOS/AliPHOSClusterizer.h
index f424056f30d..1522d3760a7 100644
--- a/PHOS/AliPHOSClusterizer.h
+++ b/PHOS/AliPHOSClusterizer.h
@@ -3,11 +3,21 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
                             
-/* $Id$ */
-
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.43  2007/09/26 14:22:17  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.42  2007/08/28 12:55:07  policheh
+ * Loaders removed from the reconstruction code (C.Cheshkov)
+ *
+ * Revision 1.41  2007/08/07 14:12:03  kharlov
+ * Quality assurance added (Yves Schutz)
+ *
+ * Revision 1.40  2006/08/25 16:56:30  kharlov
+ * Compliance with Effective C++
+ *
  * Revision 1.39  2006/03/30 13:04:56  hristov
  * AliRawReader is not persistent
  *
@@ -24,65 +34,61 @@
 //*-- Author: Yves Schutz (SUBATECH) & Dmitri Peressounko (SUBATECH & Kurchatov Institute)
 // --- ROOT system ---
 
-#include "TTask.h" 
-#include "AliConfig.h"
-#include "AliRawReaderFile.h"
+#include <TObject.h>
 
-class TFile ; 
+class TTree;
 
-// --- Standard library ---
+class AliPHOSGeometry;
+class AliPHOSCalibData ;
 
-// --- AliRoot header files ---
+using std::ostream;
 
-class AliPHOSClusterizer : public TTask {
+class AliPHOSClusterizer : public TObject {
 
 public:
 
   AliPHOSClusterizer() ;        // default ctor
-  AliPHOSClusterizer(const TString alirunFileName, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ;
-  AliPHOSClusterizer(const AliPHOSClusterizer & clusterizer);
+  AliPHOSClusterizer(AliPHOSGeometry *geom);
   virtual ~AliPHOSClusterizer() ; // dtor
-  virtual Float_t GetEmcClusteringThreshold()const {Warning("GetEmcClusteringThreshold", "Not Defined" ) ; return 0. ; }  
-  virtual Float_t GetEmcLocalMaxCut()const {Warning("GetEmcLocalMaxCut", "Not Defined" ) ; return 0. ; } 
-  virtual Float_t GetEmcLogWeight()const {Warning("GetEmcLogWeight", "Not Defined" ) ; return 0. ; } 
-  virtual Float_t GetEmcTimeGate() const {Warning("GetEmcTimeGate", "Not Defined" ) ; return 0. ; }  ;
-  virtual Float_t GetCpvClusteringThreshold()const {Warning("GetCpvClusteringThreshold", "Not Defined" ) ; return 0. ; } 
-  virtual Float_t GetCpvLocalMaxCut()const {Warning("GetCpvLocalMaxCut", "Not Defined" ) ; return 0. ; } 
-  virtual Float_t GetCpvLogWeight()const {Warning("GetCpvLogWeight", "Not Defined" ) ; return 0. ; } 
-  virtual Int_t GetRecPointsInRun()  const {Warning("GetRecPointsInRun", "Not Defined" ) ; return 0 ; } 
-
-  virtual void MakeClusters() {Warning("MakeClusters", "Not Defined" ) ; } 
-  virtual void Print(const Option_t * = "")const {Warning("Print", "Not Defined" ) ; } 
+
+  virtual void    Digits2Clusters(Option_t *option) = 0;
+  virtual Float_t GetEmcClusteringThreshold()const = 0;
+  virtual Float_t GetEmcLocalMaxCut()const = 0;
+  virtual Float_t GetEmcLogWeight()const = 0;
+  virtual Float_t GetCpvClusteringThreshold()const = 0;
+  virtual Float_t GetCpvLocalMaxCut()const = 0;
+  virtual Float_t GetCpvLogWeight()const = 0;
+
+  virtual void Print(const Option_t * = "") const = 0;
 
   virtual void SetEmcClusteringThreshold(Float_t) = 0;
   virtual void SetEmcLocalMaxCut(Float_t )        = 0;
     
   virtual void SetEmcLogWeight(Float_t)           = 0;
-  virtual void SetEmcTimeGate(Float_t)            = 0;
   virtual void SetCpvClusteringThreshold(Float_t) = 0;
   virtual void SetCpvLocalMaxCut(Float_t)         = 0;
   virtual void SetCpvLogWeight(Float_t)           = 0;
   virtual void SetUnfolding(Bool_t)               = 0;
-  void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; }
-  void SetEventFolderName(TString name) { fEventFolderName = name ; }
-  void SetRawReader(AliRawReader *reader) {fRawReader = reader;}
 
-  TString       GetEventFolderName() const {return fEventFolderName;}
-  Int_t         GetFirstEvent()      const {return fFirstEvent;     }
-  Int_t         GetLastEvent()       const {return fLastEvent;      }
-  AliRawReader *GetRawReader()       const {return fRawReader;      }
+  virtual const char * Version() const = 0;
 
-  AliPHOSClusterizer & operator = (const AliPHOSClusterizer & /*rvalue*/)  {return *this ;} 
- 
-  virtual const char * Version() const {Warning("Version", "Not Defined" ) ; return 0 ; }  
+  virtual void SetInput(TTree *digitsTree);
+  virtual void SetOutput(TTree *clustersTree);
 
 protected:
-  TString fEventFolderName ;  // event folder name
-  Int_t   fFirstEvent;        // first event to process
-  Int_t   fLastEvent;         // last  event to process
-  AliRawReader *fRawReader;   //! reader of raw data
 
-  ClassDef(AliPHOSClusterizer,4)  // Clusterization algorithm class 
+  static AliPHOSCalibData * fgCalibData ;   //! Calibration database if aval.
+  AliPHOSGeometry *fGeom; // Pointer to PHOS geometry
+  TClonesArray *fDigitsArr; // Array with input digits
+  TTree *fTreeR; // Tree with output clusters
+  TObjArray *fEMCRecPoints; // Array with EMC clusters
+  TObjArray *fCPVRecPoints; // Array with CPV clusters
+
+private:
+  AliPHOSClusterizer(const AliPHOSClusterizer & clusterizer);
+  AliPHOSClusterizer & operator = (const AliPHOSClusterizer &clusterer);
+
+  ClassDef(AliPHOSClusterizer,5)  // Clusterization algorithm class 
 
 } ;