X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSv1.h;h=3d5c6af030d4625d3c632ebc7c10a002fe0226a0;hb=98a837bf9bcdf19ea7fad7471cfaf7545fdb3604;hp=e388762ec2a10a24cd2e39a8ac0e31b1a58c8b0d;hpb=27f33ee569a288a476b807cbddb751d640789ef0;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index e388762ec2a..3d5c6af030d 100644
--- a/PHOS/AliPHOSv1.h
+++ b/PHOS/AliPHOSv1.h
@@ -3,9 +3,21 @@
 /* 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 + PPSD has name GPS2  
 // Layout EMC + CPV  has name IHEP
 //*--                  
 //*-- Author: Yves Schutz (SUBATECH)
@@ -17,8 +29,6 @@ class TFile;
 
 // --- AliRoot header files ---
 #include "AliPHOSv0.h"
-class AliPHOSQAIntCheckable ; 
-class AliPHOSQAFloatCheckable ; 
 
 class AliPHOSv1 : public AliPHOSv0 {
 
@@ -26,14 +36,10 @@ 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() ; 
-  }
   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 {
@@ -42,15 +48,9 @@ public:
   }
 
   virtual void   StepManager(void) ;                              
-  virtual TString Version(void){ return TString("v1") ;  }
-
-  AliPHOSv1 & operator = (const AliPHOSv1 & rvalue)  {
-    // assignement operator requested by coding convention but not needed
-    abort() ;
-    return *this ; 
-  }
+  virtual const TString Version(void)const { return TString("v1") ;  }
 
-  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) ;
 
@@ -76,11 +76,6 @@ public:
 
 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
@@ -90,7 +85,11 @@ protected:
   Float_t fLightFactor ;            //! a calculated factor
   Float_t fAPDFactor ;              //! a calculated factor
 
-  ClassDef(AliPHOSv1,1)  // Implementation of PHOS manager class for layout EMC+PPSD
+ private:
+  AliPHOSv1(AliPHOSv1 & phos);
+  AliPHOSv1 & operator = (const AliPHOSv1 & /*rvalue*/);
+
+  ClassDef(AliPHOSv1,2)  // Implementation of PHOS manager class for layout EMC+PPSD
 
 };