X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSv1.h;h=e0ffa0e1ce54eed5d1a974c443d97287e4536b17;hb=566067b0ce08d16621896e5e3f0badde192f8773;hp=3487d7da2bbfed7080dd97e2da06cbfbfddfbada;hpb=a8c47ab60ad997f04fe8b6319252c3e891625397;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index 3487d7da2bb..e0ffa0e1ce5 100644
--- a/PHOS/AliPHOSv1.h
+++ b/PHOS/AliPHOSv1.h
@@ -3,21 +3,32 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+/* $Id$ */
+
+/* History of cvs commits:
+ *
+ * $Log$
+ * Revision 1.40  2006/09/13 07:31:01  kharlov
+ * Effective C++ corrections (T.Pocheptsov)
+ *
+ * Revision 1.39  2005/05/28 14:19:05  schutz
+ * Compilation warnings fixed by T.P.
+ *
+ */
+
 //_________________________________________________________________________
 // Implementation version v1 of PHOS Manager class 
 // Layout EMC + CPV  has name IHEP
-//*--                  
-//*-- Author: Yves Schutz (SUBATECH)
+//--                  
+//-- Author: Yves Schutz (SUBATECH)
 
 // --- ROOT system ---
 class TClonesArray ;
-class TLorentzVector ;
 class TFile;
+#include <TLorentzVector.h>
 
 // --- AliRoot header files ---
 #include "AliPHOSv0.h"
-class AliPHOSQAIntCheckable ; 
-class AliPHOSQAFloatCheckable ; 
 
 class AliPHOSv1 : public AliPHOSv0 {
 
@@ -25,14 +36,10 @@ public:
 
   AliPHOSv1(void) ;
   AliPHOSv1(const char *name, const char *title="") ;
-  AliPHOSv1(const AliPHOSv1 & phos) : AliPHOSv0(phos) {
-    // cpy ctor: no implementation yet
-    // requested by the Coding Convention
-    Fatal("cpy ctor", "not implemented") ; 
-  }
   virtual ~AliPHOSv1(void) ;
 
-  virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits) ; 
+  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 {
@@ -43,53 +50,16 @@ public:
   virtual void   StepManager(void) ;                              
   virtual const TString Version(void)const { return TString("v1") ;  }
 
-  AliPHOSv1 & operator = (const AliPHOSv1 & rvalue)  {
-    // assignement operator requested by coding convention but not needed
-    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
+ private:
+  AliPHOSv1(AliPHOSv1 & phos);
+  AliPHOSv1 & operator = (const AliPHOSv1 & /*rvalue*/);
+  TClonesArray fCPVDigits; //! Array of CPV digits per current CPV hit
 
-  ClassDef(AliPHOSv1,1)  // Implementation of PHOS manager class for layout EMC+PPSD
+  ClassDef(AliPHOSv1,5)  // Implementation of PHOS manager class for layout EMC+PPSD
 
 };