updates for Effective C++ compiler flags

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

diff --git a/EMCAL/AliEMCALClusterizerv1.h b/EMCAL/AliEMCALClusterizerv1.h
index 7ee3fa430f77ea9bb4ff839bec798dc3df962871..bf33d2abc99377652ac36e7826a9a203433f4f1b 100644 (file)
--- a/EMCAL/AliEMCALClusterizerv1.h
+++ b/EMCAL/AliEMCALClusterizerv1.h
@@ -36,13 +36,24 @@ class AliEMCALClusterizerv1 : public AliEMCALClusterizer {
 public:
   
   AliEMCALClusterizerv1() ;         
+  //cpy ctor required by coding convention
+  AliEMCALClusterizerv1(const AliEMCALClusterizerv1& clus);
+
   AliEMCALClusterizerv1(const TString alirunFileNameFile, const TString eventFolderName = AliConfig::GetDefaultEventFolderName());
   virtual ~AliEMCALClusterizerv1()  ;
   virtual void Browse(TBrowser* b);
-  
+
+  AliEMCALClusterizerv1 & operator = (const AliEMCALClusterizerv1 &) {
+    Fatal("operator =", "not implemented") ;
+    return *this ;
+  }
+
   virtual Int_t   AreNeighbours(AliEMCALDigit * d1, AliEMCALDigit * d2)const ; 
                                // Checks if digits are in neighbour cells 
 
+  // Checks if digits are in a tower group; for pseudoclusters 
+  virtual Int_t   AreInGroup(AliEMCALDigit * d1, AliEMCALDigit * d2)const ; 
+
   virtual Float_t Calibrate(Int_t amp, Int_t cellId) ;  // Tranforms Amp to energy 
 
   virtual void    GetNumberOfClustersFound(int numb )const{ numb = fNumberOfECAClusters ;} 
@@ -77,19 +88,21 @@ public:
 protected:
 
   void           WriteRecPoints() ;
-  virtual void   MakeClusters( ) ;            
+  virtual void   MakeClusters(char* opt ) ;            
+  virtual void   MakeClusters() { Fatal("MakeClusters","not implemented"); }
+            
 ///////////////////// 
    TList  *fHists;   //!
-   TH1F* pointE;
-   TH1F* pointL1;
-   TH1F* pointL2;
-   TH1F* pointDis;
-   TH1F* pointMult;
-   TH1F* digitAmp;
-   TH1F* MaxE;
-   TH1F* MaxL1;
-   TH1F* MaxL2;
-   TH1F* MaxDis;
+   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 maximum point L1
+   TH1F* fMaxL2;     //histogram of maximum point L2
+   TH1F* fMaxDis;    //histogram of maximum point dispersion
 ///////////////////////
 
 
@@ -108,16 +121,16 @@ private:
                               AliEMCALDigit ** /*maxAt*/,
                               Float_t * /*maxAtEnergy*/ ) const; //Unfolds cluster using TMinuit package
   void           PrintRecPoints(Option_t * option) ;
-  //  TFile* recofile;
+
 private:
+  AliEMCALGeometry* fGeom;           //! pointer to geometry for utilities
 
   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
-  
+
+  Int_t   fNTowerInGroup;            // number of towers to group for pseudoclusters
+
   //Calibration parameters... to be replaced by database 
 
   AliEMCALCalibData * fCalibData  ;   //! Calibration database if aval