Fix compiler problems

[u/mrichter/AliRoot.git] / PHOS / AliPHOSv1.h

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index 3fd8a78653dca45de6d904b293956cb9d01f0b19..3f07a56a047744ec09b3a070fe582b5649e2a213 100644 (file)
--- a/PHOS/AliPHOSv1.h
+++ b/PHOS/AliPHOSv1.h
@@ -3,9 +3,15 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+/* $Id$ */
+
+/* History of cvs commits:
+ *
+ * $Log$
+ */
+
 //_________________________________________________________________________
 // Implementation version v1 of PHOS Manager class 
-// Layout EMC + PPSD has name GPS2  
 // Layout EMC + CPV  has name IHEP
 //*--                  
 //*-- Author: Yves Schutz (SUBATECH)
@@ -17,8 +23,6 @@ class TFile;
 
 // --- AliRoot header files ---
 #include "AliPHOSv0.h"
-class AliPHOSQAIntCheckable ; 
-class AliPHOSQAFloatCheckable ; 
 
 class AliPHOSv1 : public AliPHOSv0 {
 
@@ -26,14 +30,15 @@ public:
 
   AliPHOSv1(void) ;
   AliPHOSv1(const char *name, const char *title="") ;
-  AliPHOSv1(const AliPHOSv1 & phos) {
-    // cpy ctor: no implementation yet
-    // requested by the Coding Convention
-    abort() ; 
+  AliPHOSv1(AliPHOSv1 & phos) : AliPHOSv0(phos) {
+    phos.Copy(*this) ; 
   }
   virtual ~AliPHOSv1(void) ;
 
-  virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits) ; 
+  virtual void   Copy(TObject &phos) const; 
+
+  using AliPHOSv0::AddHit;
+  virtual void   AddHit( Int_t shunt, Int_t primary, Int_t id, Float_t *hits) ; 
   virtual void   FinishEvent() ;
   virtual void   FinishPrimary() ;
   virtual Int_t  IsVersion(void) const {
@@ -42,30 +47,50 @@ public:
   }
 
   virtual void   StepManager(void) ;                              
-  virtual TString Version(void){ 
-    // returns the version number 
-    return TString("v1") ; 
-  }
+  virtual const TString Version(void)const { return TString("v1") ;  }
 
-  AliPHOSv1 & operator = (const AliPHOSv1 & rvalue)  {
+  AliPHOSv1 & operator = (const AliPHOSv1 & /*rvalue*/)  {
     // assignement operator requested by coding convention but not needed
-    abort() ;
+    Fatal("operator =", "not implemented") ;
     return *this ; 
   }
 
-  void       CPVDigitize (TLorentzVector p, Float_t *xy, Int_t moduleNumber, TClonesArray *digits) ;
+  void       CPVDigitize (TLorentzVector p, Float_t *xy, TClonesArray *digits) ;
   Float_t    CPVPadResponseFunction(Float_t qhit, Float_t zg, Float_t xg) ;
   Double_t   CPVCumulPadResponse(Double_t x, Double_t y) ;
 
+  //Variables conserning light yeild and APD efficiency
+  Float_t GetLightYieldMean()         const { return  fLightYieldMean ;}
+  Float_t GetLightYieldAttenuation()  const { return  fLightYieldAttenuation ;}
+  Float_t GetRecalibrationFactor()    const { return  fRecalibrationFactor ;}
+  Float_t GetAPDGain()                const { return  fAPDGain ;}
+  Float_t GetIntrinsicPINEfficiency() const { return  fIntrinsicPINEfficiency ;}
+  Float_t GetElectronsPerGeV()        const { return  fElectronsPerGeV ;}
+
+  void    SetLightYieldMean(Float_t LightYieldMean) 
+                                   {fLightYieldMean = LightYieldMean;}
+  void    SetLightYieldAttenuation(Float_t LightYieldAttenuation)
+                                   {fLightYieldAttenuation = LightYieldAttenuation;}
+  void    SetIntrinsicPINEfficiency(Float_t IntrinsicPINEfficiency) 
+                                   {fIntrinsicPINEfficiency = IntrinsicPINEfficiency;}
+  void    SetRecalibrationFactor(Float_t RecalibrationFactor) 
+                                   {fRecalibrationFactor = RecalibrationFactor;}
+  void    SetElectronsPerGeV(Float_t ElectronsPerGeV) 
+                                   {fElectronsPerGeV = ElectronsPerGeV;}
+  void    SetAPDGain(Float_t APDGain)   {fAPDGain = APDGain;}
+
 protected:
 
-  
-  AliPHOSQAIntCheckable   * fQAHitsMul ;  // QA Hits Multiplicity checkable
-  TClonesArray * fQAHitsMulB ;        // QA Hits Multiplicity / Block checkable
-  AliPHOSQAFloatCheckable * fQATotEner ;  // QA Total Energy checkable
-  TClonesArray * fQATotEnerB ;        // QA Total Energy / Block checkable
+  Float_t fLightYieldMean ;         // Mean lightyield in the PbOW4 xtal per GeV (Poisson distribution)
+  Float_t fIntrinsicPINEfficiency ; // Photo efficiency of the PIN diode   
+  Float_t fLightYieldAttenuation ;  // Attenuation of the light through the crystal
+  Float_t fRecalibrationFactor ;    // Recalibration factor
+  Float_t fElectronsPerGeV ;        // Number of electrons per GeV created in the PIN by a ionizing particle
+  Float_t fAPDGain ;                // APD Gain
+  Float_t fLightFactor ;            //! a calculated factor
+  Float_t fAPDFactor ;              //! a calculated factor
 
-  ClassDef(AliPHOSv1,1)  // Implementation of PHOS manager class for layout EMC+PPSD
+  ClassDef(AliPHOSv1,2)  // Implementation of PHOS manager class for layout EMC+PPSD
 
 };