Fixing typo (clang)

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALClusterizerv1.h

diff --git a/EMCAL/AliEMCALClusterizerv1.h b/EMCAL/AliEMCALClusterizerv1.h
index ee8d369b023fe7e1ee700d9a5f1bef2278a5c328..fe7151ebbeb94be6a478a18924bc9e58ce790680 100644 (file)
--- a/EMCAL/AliEMCALClusterizerv1.h
+++ b/EMCAL/AliEMCALClusterizerv1.h
@@ -9,106 +9,46 @@
 //  Implementation version 1 of the clusterization algorithm                     
 //  Performs clusterization (collects neighbouring active cells) and 
 //  unfolding of the clusters with several local maxima.  
-//  results are stored in TreeR#, branches PHOSEmcRP (EMC recPoints),
-//  PHOSCpvRP (CPV RecPoints) and AliPHOSClusterizer
+//  results are stored in TreeR
 //
 //*-- Author: Yves Schutz (SUBATECH)
-// Modif: 
-//  August 2002 Yves Schutz: clone PHOS as closely as possible and intoduction
-//                           of new  IO (à la PHOS)
+//--          Gustavo Conesa (LPSC-Grenoble), move common clusterizer functionalities to mother class
+                        
 
 // --- ROOT system ---
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-
 #include "AliEMCALClusterizer.h"
 class AliEMCALRecPoint ; 
 class AliEMCALDigit ;
-class AliEMCALDigitizer ;
-class AliEMCALGeometry ;
-
 
 class AliEMCALClusterizerv1 : public AliEMCALClusterizer {
   
 public:
   
   AliEMCALClusterizerv1() ;         
-  AliEMCALClusterizerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::GetDefaultEventFolderName());
+  AliEMCALClusterizerv1(AliEMCALGeometry* geometry);
+  AliEMCALClusterizerv1(AliEMCALGeometry* geometry, AliEMCALCalibData * calib, AliCaloCalibPedestal * pedestal);
+       
   virtual ~AliEMCALClusterizerv1()  ;
-  
-  virtual Int_t   AreNeighbours(AliEMCALDigit * d1, AliEMCALDigit * d2)const ; 
-                               // Checks if digits are in neighbour cells 
-
-  virtual Float_t Calibrate(Int_t amp)const ;  // Tranforms Amp to energy 
 
-  virtual void    GetNumberOfClustersFound(int numb )const{ numb = fNumberOfECAClusters ;} 
-  virtual Float_t GetECAClusteringThreshold()const{ return fECAClusteringThreshold;}  
-  virtual Float_t GetECALocalMaxCut()const       { return fECALocMaxCut;} 
-  virtual Float_t GetECALogWeight()const         { return fECAW0;}   
+  virtual Int_t   AreNeighbours(AliEMCALDigit * d1, AliEMCALDigit * d2, Bool_t & shared)const ; 
+                               // Checks if digits are in neighbour cells
+  virtual void    Digits2Clusters(Option_t *option);                // Does the job
 
-  virtual Float_t GetTimeGate() const            { return fTimeGate ; }
-  virtual const char *  GetRecPointsBranch() const{ return GetName() ;}
-  virtual const Int_t GetRecPointsInRun() const   {return fRecPointsInRun ;} 
-
-  void    Exec(Option_t *option);                // Does the job
-
-  virtual void Print(Option_t * option)const ;
-
-  virtual void SetECAClusteringThreshold(Float_t cluth)  { fECAClusteringThreshold = cluth ; }
-  virtual void SetECALocalMaxCut(Float_t cut)            { fECALocMaxCut = cut ; }
-  virtual void SetECALogWeight(Float_t w)                { fECAW0 = w ; }
-  virtual void SetTimeGate(Float_t gate)                 { fTimeGate = gate ;}
-  virtual void SetUnfolding(Bool_t toUnfold = kTRUE )    {fToUnfold = toUnfold ;}  
-  static Double_t ShowerShape(Double_t r) ; // Shape of EM shower used in unfolding; 
-                                            //class member function (not object member function)
-  static void UnfoldingChiSquare(Int_t & nPar, Double_t * Grad, Double_t & fret, Double_t * x, Int_t iflag)  ;
-                                            // Chi^2 of the fit. Should be static to be passes to MINUIT
-  void Unload() ; 
   virtual const char * Version() const { return "clu-v1" ; }  
 
 protected:
 
-  void           WriteRecPoints() ;
-  virtual void   MakeClusters( ) ;            
-  
-private:
-
-  const TString BranchName() const ; 
-  void    GetCalibrationParameters(void) ;
-  
-  Bool_t  FindFit(AliEMCALRecPoint * emcRP, AliEMCALDigit ** MaxAt, Float_t * maxAtEnergy, 
-                 Int_t NPar, Float_t * FitParametres) const; //Used in UnfoldClusters, calls TMinuit
-  void Init() ;
-  void InitParameters() ;
-
-  virtual void   MakeUnfolding() const;
-  void           UnfoldCluster(AliEMCALRecPoint * /*iniEmc*/, Int_t /*Nmax*/, 
-                              AliEMCALDigit ** /*maxAt*/,
-                              Float_t * /*maxAtEnergy*/ ) const; //Unfolds cluster using TMinuit package
-  void           PrintRecPoints(Option_t * option) ;
+  virtual void   MakeClusters();            
 
 private:
+  AliEMCALClusterizerv1(const AliEMCALClusterizerv1 &); //copy ctor
+  AliEMCALClusterizerv1 & operator = (const AliEMCALClusterizerv1 &);
 
-  Bool_t  fDefaultInit;              //! Says if the task was created by defaut ctor (only parameters are initialized)
-
-  Int_t   fNTowers ;                 // number of Towers in EMCAL
-
-  Bool_t  fToUnfold ;                // To perform unfolding 
-  Int_t   fNumberOfECAClusters ;     // number of clusters found in EC section
-  
-  //Calibration parameters... to be replaced by database 
-  Float_t fADCchannelECA ;          // width of one ADC channel for EC section (GeV)
-  Float_t fADCpedestalECA ;         // pedestal of ADC for EC section (GeV) 
- 
-  Float_t fECAClusteringThreshold ;  // minimum energy to include a EC digit in a cluster
-  Float_t fECALocMaxCut ;            // minimum energy difference to distinguish local maxima in a cluster
-  Float_t fECAW0 ;                   // logarithmic weight for the cluster center of gravity calculation
-  Int_t fRecPointsInRun ;            //! Total number of recpoints in one run
-  Float_t fTimeGate ;                // Maximum time difference between the digits in ont EMC cluster
-    
-  ClassDef(AliEMCALClusterizerv1,3)   // Clusterizer implementation version 1
+  ClassDef(AliEMCALClusterizerv1,10)   // Clusterizer implementation version 1
 
 };