X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALClusterizerv1.h;h=afeefc7e2e09382e5952ca5464b67381d885e3cd;hb=80336a64e32f3923966f53cc886e5cb01a624a42;hp=360c71eb3c7b7a0240237ae6dda8cfac0d0715f9;hpb=7ea6391baafe045cbd3bda942cfe2f8d7dc2a90a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALClusterizerv1.h b/EMCAL/AliEMCALClusterizerv1.h
index 360c71eb3c7..afeefc7e2e0 100644
--- a/EMCAL/AliEMCALClusterizerv1.h
+++ b/EMCAL/AliEMCALClusterizerv1.h
@@ -36,6 +36,7 @@ class AliEMCALClusterizerv1 : public AliEMCALClusterizer {
 public:
   
   AliEMCALClusterizerv1() ;         
+  AliEMCALClusterizerv1(AliEMCALGeometry* geometry);
 
   virtual ~AliEMCALClusterizerv1()  ;
 
@@ -62,16 +63,11 @@ public:
   virtual void SetECALogWeight(Float_t w)                { fECAW0 = w ; }
   virtual void SetTimeCut(Float_t gate)                 { fTimeCut = gate ;}
   virtual void SetUnfolding(Bool_t toUnfold = kTRUE )    {fToUnfold = toUnfold ;}  
-  static Double_t ShowerShape(Double_t r) ; // Shape of EM shower used in unfolding; 
+  static Double_t ShowerShape(Double_t x, Double_t y) ; // 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
   virtual const char * Version() const { return "clu-v1" ; }  
- 
-  //JLK
-  //TList* BookHists();
-  //void   SaveHists(const char *fn="reco.root");  //*MENU*
-  //void   DrawLambdasHists();                     //*MENU*
 
   void   PrintRecoInfo();                        //*MENU*
 
@@ -79,22 +75,6 @@ protected:
 
   virtual void   MakeClusters();            
 
-  //JLK
-///////////////////// 
-  // TList  *fHists;   //!
-  // TH1F* fPointE;    //histogram of point energy
-  // TH1F* fPointL1;   //histogram of point L1
-  // TH1F* fPointL2;   //histogram of point L2
-  // TH1F* fPointDis;  //histogram of point dispersion
-  // TH1F* fPointMult; //histogram of point multiplicity
-  // TH1F* fDigitAmp;  //histogram of digit ADC Amplitude
-  // TH1F* fMaxE;      //histogram of maximum point energy
-  // TH1F* fMaxL1;     //histogram of largest (first) of eigenvalue of covariance matrix
-  // TH1F* fMaxL2;     //histogram of smalest (second) of eigenvalue of covariace matrix
-  // TH1F* fMaxDis;    //histogram of point dispersion
-///////////////////////
-
-
 private:
   AliEMCALClusterizerv1(const AliEMCALClusterizerv1 &); //copy ctor
   AliEMCALClusterizerv1 & operator = (const AliEMCALClusterizerv1 &);
@@ -106,10 +86,10 @@ private:
   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
+  virtual void   MakeUnfolding();
+  void           UnfoldCluster(AliEMCALRecPoint * iniEmc, Int_t Nmax, 
+			       AliEMCALDigit ** maxAt,
+			       Float_t * maxAtEnergy ); //Unfolds cluster using TMinuit package
   void           PrintRecPoints(Option_t * option) ;
 
 private:
@@ -131,8 +111,6 @@ private:
   Float_t fTimeCut ;                // Maximum time difference between the digits in ont EMC cluster
   Float_t fMinECut;                  // Minimum energy for a digit to be a member of a cluster
 
-  //JLK
-  //ClassDef(AliEMCALClusterizerv1,6)   // Clusterizer implementation version 1
   ClassDef(AliEMCALClusterizerv1,7)   // Clusterizer implementation version 1
 
 };