X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSv1.h;h=2329c849947f30eea650907d783775e021583be8;hb=54a7f1575112bc78b61c07227facc7f7060fe1a7;hp=3945040aa60ce9854b971ed7bc6161987291ffbd;hpb=3d402178364a5dc0fd629830bce14793e968eedb;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index 3945040aa60..2329c849947 100644
--- a/PHOS/AliPHOSv1.h
+++ b/PHOS/AliPHOSv1.h
@@ -6,20 +6,21 @@
 //_________________________________________________________________________
 // Implementation version v1 of PHOS Manager class 
 // Layout EMC + PPSD has name GPS2  
-//                  
+// Layout EMC + CPV  has name IHEP
+//*--                  
 //*-- Author: Yves Schutz (SUBATECH)
 
 // --- ROOT system ---
 #include "TClonesArray.h"
 
+class TFile;
+
 // --- AliRoot header files ---
 #include "AliPHOSv0.h"
 #include "AliPHOSGeometry.h"
 #include "AliPHOSReconstructioner.h"
 #include "AliPHOSTrackSegmentMaker.h"
 #include "AliPHOSPID.h"
-#include "AliPHOSCPVModule.h"
-#include "AliPHOSCPVHit.h"
 #include "AliPHOSCPVDigit.h"
 
 class AliPHOSv1 : public AliPHOSv0 {
@@ -36,25 +37,28 @@ public:
   }
   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) ;                               
+  virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits) ; 
+  Float_t        Calibrate(Int_t amp){ return (amp - fDigitizeA)/fDigitizeB ; }
+  Int_t          Digitize(Float_t Energy){ return (Int_t ) (fDigitizeA + Energy*fDigitizeB); }
+  virtual void   Hits2SDigits() ;
+  virtual void   MakeBranch(Option_t* opt, char *file=0 ) ;
+  void           Reconstruction(AliPHOSReconstructioner * Reconstructioner) ;
+  void           ResetClusters(){} ;
+  virtual void   SDigits2Digits() ;  
   virtual Int_t  IsVersion(void) const {
     // Gives the version number 
     return 1 ; 
   }
-  virtual void   MakeBranch(Option_t* opt) ;
-  void           Reconstruction(AliPHOSReconstructioner * Reconstructioner) ;
-  void           ResetClusters(){} ;
-  virtual void   ResetDigits() ; 
-  virtual void   ResetHits() ; 
+
   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(); 
+  void           SetPpsdEnergyThreshold(Float_t enth)      { fPpsdEnergyThreshold = enth ; } 
+  void           SetCpvEnergyThreshold(Float_t enth)       { fCpvEnergyThreshold = enth ; } 
+
   virtual void   StepManager(void) ;                              
   virtual TString Version(void){ 
     // returns the version number 
@@ -62,15 +66,11 @@ public:
   }
 
   AliPHOSv1 & operator = (const AliPHOSv1 & rvalue)  {
-    // assignement operator requested by coding convention
-    // but not needed
+    // assignement operator requested by coding convention but not needed
     assert(0==1) ;
     return *this ; 
   }
 
-  // IHEP's CPV specific functions
-
-  AliPHOSCPVModule &GetCPVModule(int n) { return *(AliPHOSCPVModule*)fCPVModules->operator[](n); }
   void       CPVDigitize (TLorentzVector p, Float_t *xy, Int_t moduleNumber, TClonesArray *digits) ;
   Float_t    CPVPadResponseFunction(Float_t qhit, Float_t zg, Float_t xg) ;
   Double_t   CPVCumulPadResponse(Double_t x, Double_t y) ;
@@ -78,14 +78,15 @@ public:
 protected:
 
   Float_t fDigitThreshold ;                       // Threshold for the digit registration 
-  Int_t fNTmpHits ;                               //!  Used internally for digitalization
+  Float_t fPpsdEnergyThreshold;                   //PPSD
+  Float_t fCpvEnergyThreshold;                    //CPV  
   Float_t fPinElectronicNoise  ;                  // Electronic Noise in the PIN
-  AliPHOSReconstructioner * fReconstructioner ;   // Reconstrutioner of the PHOS event: Clusterization and subtracking procedures
-  TClonesArray * fTmpHits ;                       //!  Used internally for digitalization 
+  Float_t fDigitizeA ;                            //Parameters of the 
+  Float_t fDigitizeB ;                            //digitization 
+  Int_t   fnSdigits ; 
+  AliPHOSReconstructioner  * fReconstructioner ;  // Clusterization and subtracking procedures
   AliPHOSTrackSegmentMaker * fTrackSegmentMaker ; // Reconstructioner of the PHOS track segment: 2 x PPSD + 1 x EMC
 
-  TClonesArray * fCPVModules;                     // Array of CPV modules for the IHEP's version of CPV
-
   ClassDef(AliPHOSv1,1)  // Implementation of PHOS manager class for layout EMC+PPSD
 
 };