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

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index 22a5948a18b..e0ffa0e1ce5 100644
--- a/PHOS/AliPHOSv1.h
+++ b/PHOS/AliPHOSv1.h
@@ -3,17 +3,29 @@
 /* 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)
+//--                  
+//-- Author: Yves Schutz (SUBATECH)
 
 // --- ROOT system ---
 class TClonesArray ;
-class TLorentzVector ;
 class TFile;
+#include <TLorentzVector.h>
 
 // --- AliRoot header files ---
 #include "AliPHOSv0.h"
@@ -24,39 +36,30 @@ 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); 
- virtual Int_t  IsVersion(void) 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 {
     // Gives the version number 
     return 1 ; 
   }
 
   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)  {
-    // assignement operator requested by coding convention but not needed
-    abort() ;
-    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) ;
 
-protected:
-
+ 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
 
 };