X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALv1.h;h=553f2f48593e93e8e449314fb31b4e9c5ac87347;hb=05a92d59aeb65ac1e2f05b1c0600345cea26698b;hp=1e94de26cc304f00a8a9bf1eced24dec441e5053;hpb=b13bbe81cd3f69746e33dd3e57b1ebe4e43ca29b;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALv1.h b/EMCAL/AliEMCALv1.h
index 1e94de26cc3..553f2f48593 100644
--- a/EMCAL/AliEMCALv1.h
+++ b/EMCAL/AliEMCALv1.h
@@ -9,7 +9,7 @@
 // Implementation version v1 of EMCAL Manager class 
 //*--                  
 //*-- Author: Sahal Yacoob (LBL / UCT) 
-//*--  and  : Jennifer Klay
+//*--  and  : Jennifer Klay (LBL)
 //#include <assert.h>
 
 // --- ROOT system ---
@@ -21,24 +21,37 @@ class TFile;
 #include "AliEMCALv0.h"
 
 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) {abort();}
-    virtual ~AliEMCALv1(void) ;
-    virtual void  AddHit( Int_t shunt, Int_t primary, Int_t track,
-			  Int_t id, Float_t *hits, TLorentzVector *p);
-    // Gives the version number 
-    virtual Int_t  IsVersion(void) const {return 1;}
-    virtual void StepManager(void) ;
-    virtual TString Version(void){return TString("v0");}
-    // assignement operator requested by coding convention but not needed  
-    AliEMCALv1 & operator = (const AliEMCALv0 & rvalue){abort();return *this;}
   
- protected:
-    ClassDef(AliEMCALv1,1)//Implementation of EMCAL manager class for layout EMC+PPSD
+public:
+
+  AliEMCALv1(void) ; 
+  AliEMCALv1(const char *name, const char *title="") ;
+  // cpy ctor: no implementation yet
+  // requested by the Coding Convention
+  AliEMCALv1(const AliEMCALv0 & emcal) {abort();}
+  virtual ~AliEMCALv1(void) ;
+  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 
+  virtual Int_t  IsVersion(void) const {return 1;}
+  virtual void StepManager(void) ;
+  virtual const TString Version(void)const {return TString("v0");}
+  // assignement operator requested by coding convention but not needed  
+  AliEMCALv1 & operator = (const AliEMCALv0 & rvalue){abort();return *this;}
+ 
+    
+private:
+
+  Float_t fLightYieldMean ;         // Mean lightyield in a plastic layer per GeV (Poisson distribution)
+  Float_t fIntrinsicAPDEfficiency ; // Photo efficiency of the APD diode   
+  Float_t fLightYieldAttenuation ;  // Attenuation of the light through the light fiber
+  Float_t fRecalibrationFactor ;    // Recalibration factor
+  Float_t fAPDGain ;                // APD Gain
+  Float_t fLightFactor ;            //! a calculated factor
+  Float_t fAPDFactor ;              //! a calculated factor
+
+  ClassDef(AliEMCALv1,4)//Implementation of EMCAL manager class to produce hits in a Central Calorimeter 
 
 };
+
 #endif // AliEMCALV1_H