X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSv1.h;h=e0ffa0e1ce54eed5d1a974c443d97287e4536b17;hb=68042216443903b7bb4c042d5df9aa124639ed8b;hp=6825e83dd845fb6a6819df89124fcd309c78d76c;hpb=0a6d52e36efda880a3b1544767b5270efd178466;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index 6825e83dd84..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 + PPSD has name GPS2  
-//                  
-//*-- Author: Yves Schutz (SUBATECH)
+// Layout EMC + CPV  has name IHEP
+//--                  
+//-- Author: Yves Schutz (SUBATECH)
 
 // --- ROOT system ---
-#include "TClonesArray.h"
+class TClonesArray ;
+class TFile;
+#include <TLorentzVector.h>
 
 // --- AliRoot header files ---
 #include "AliPHOSv0.h"
-#include "AliPHOSGeometry.h"
-#include "AliPHOSReconstructioner.h"
-#include "AliPHOSTrackSegmentMaker.h"
-#include "AliPHOSPID.h"
 
 class AliPHOSv1 : public AliPHOSv0 {
 
@@ -25,57 +36,30 @@ public:
 
   AliPHOSv1(void) ;
   AliPHOSv1(const char *name, const char *title="") ;
-  AliPHOSv1(AliPHOSReconstructioner * Reconstructioner, const char *name, const char *title="") ;
-  AliPHOSv1(const AliPHOSv1 & phos) {
-    // cpy ctor: no implementation yet
-    // requested by the Coding Convention
-    assert(0==1) ; 
-  }
   virtual ~AliPHOSv1(void) ;
 
-  virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) ; 
-  Int_t          Digitize(Float_t Energy);
-  virtual void   FinishEvent(void) ;                               
-  Int_t IsVersion(void) const { return 1 ; }
-  virtual void   MakeBranch(Option_t* opt) ;
-  virtual  AliPHOSRecPoint::RecPointsList *  PpsdRecPoints() {
-    // Getting list of PPSD RecPoints
-    return fPpsdRecPoints ;
-  }
-  void           Reconstruction(AliPHOSReconstructioner * Reconstructioner) ;
-  void           ResetClusters(){} ;
-  virtual void   ResetDigits() ; 
-  virtual void   ResetReconstruction() ; // Reset reconstructed objects
-  void           SetReconstructioner(AliPHOSReconstructioner& Reconstructioner) {
-    // sets the reconstructionner object to be used
-    fReconstructioner = &Reconstructioner ;
-  } 
-  void           SetDigitThreshold(Float_t th) { fDigitThreshold = th ; } 
-  virtual void   SetTreeAddress(); 
-  virtual void   StepManager(void) ;                              
-  virtual TString Version(void){ 
-    // returns the version number 
-    return TString("v1") ; 
+  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 ; 
   }
 
-  AliPHOSv1 & operator = (const AliPHOSv1 & rvalue)  {
-    // assignement operator requested by coding convention
-    // but not needed
-    assert(0==1) ;
-    return *this ; 
-  }
+  virtual void   StepManager(void) ;                              
+  virtual const TString Version(void)const { return TString("v1") ;  }
 
-protected:
+  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) ;
 
-  Float_t fDigitThreshold ;                       // Threshold for the digit registration 
-  Int_t fNTmpHits ;                               //!  Used internally for digitalization
-  Float_t fPinElectronicNoise  ;                  // Electronic Noise in the PIN
-  AliPHOSRecPoint::RecPointsList * fPpsdRecPoints ; // The RecPoints (clusters) list in PPSD 
-  AliPHOSReconstructioner * fReconstructioner ;   // Reconstrutioner of the PHOS event: Clusterization and subtracking procedures
-  TClonesArray * fTmpHits ;                       //!  Used internally for digitalization 
-  AliPHOSTrackSegmentMaker * fTrackSegmentMaker ; // Reconstructioner of the PHOS track segment: 2 x PPSD + 1 x EMC
+ 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
 
 };