Adding include path to allow compilation of CleanGeom task

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

diff --git a/EMCAL/AliEMCALv1.h b/EMCAL/AliEMCALv1.h
index 18d28f1937491fab096b51246d2f5c86f532f99a..a8ead544176b21a9458ce455132814234d8b1d86 100644 (file)
--- a/EMCAL/AliEMCALv1.h
+++ b/EMCAL/AliEMCALv1.h
@@ -25,12 +25,10 @@ class AliEMCALv1 : public AliEMCALv0 {
 public:
 
   AliEMCALv1(void) ; 
-  AliEMCALv1(const char *name, const char *title="") ;
-  // cpy ctor: no implementation yet
-  // requested by the Coding Convention
-  AliEMCALv1(const AliEMCALv0 & emcal):AliEMCALv0(emcal) {
-    Fatal("cpy ctor", "not implemented") ;  }
+  AliEMCALv1(const char *name, const char *title="", const Bool_t checkGeoAndRun = kTRUE) ;
   virtual ~AliEMCALv1(void) ;
+
+  using AliEMCALv0::AddHit;
   virtual void  AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t iparent, Float_t ienergy,
                        Int_t id, Float_t *hits, Float_t *p);
   // Gives the version number 
@@ -40,20 +38,19 @@ public:
   virtual void FinishPrimary();
   virtual const TString Version(void)const {return TString("v0");}
   virtual void SetTimeCut(Float_t tc){ fTimeCut = tc;}
-  virtual Float_t GetTimeCut(){return fTimeCut;}
-  // assignement operator requested by coding convention but not needed  
-  AliEMCALv1 & operator = (const AliEMCALv0 & /*rvalue*/){
-    Fatal("operator =", "not implemented") ;  
-    return *this;}
- 
+  virtual Float_t GetTimeCut() const {return fTimeCut;} 
     
-private:
-  Int_t fCurPrimary;
-  Int_t fCurParent;
-  Int_t fCurTrack;
-  Float_t fTimeCut;       // Cut to remove the background from the ALICE system
+protected:
+  Int_t fCurPrimary;  // Current primary track
+  Int_t fCurParent;   // Current parent 
+  Int_t fCurTrack;    // Current track
+  Float_t fTimeCut;   // Cut to remove the background from the ALICE system
+
+ private:
+  AliEMCALv1(const AliEMCALv1 & emcal);
+  AliEMCALv1 & operator = (const AliEMCALv1  & /*rvalue*/);
 
-  ClassDef(AliEMCALv1,8)//Implementation of EMCAL manager class to produce hits in a Central Calorimeter 
+  ClassDef(AliEMCALv1,9) // Implementation of EMCAL manager class to produce hits in a Central Calorimeter 
     
 };