parameters have been redistributed; Hits2SDigits etc ... introduce

[u/mrichter/AliRoot.git] / PHOS / AliPHOS.h

diff --git a/PHOS/AliPHOS.h b/PHOS/AliPHOS.h
index 849bd4a143354787c02ce6045f902f75a93b584c..1761e48f9854c0c9766c427fd1dc69c375692b61 100644 (file)
--- a/PHOS/AliPHOS.h
+++ b/PHOS/AliPHOS.h
@@ -25,32 +25,40 @@ class AliPHOS : public AliDetector {
 
  public:
 
-  AliPHOS(const char* name, const char* title): AliDetector(name,title) {} 
-  AliPHOS() : AliDetector() {
-    // default ctor
-  } 
+  AliPHOS() ;
+  AliPHOS(const char* name, const char* title="");
   AliPHOS(const AliPHOS & phos) {
     // cpy ctor: no implementation yet
     // requested by the Coding Convention
     assert(0==1) ; 
   }
   virtual ~AliPHOS() ; 
- 
-  virtual  void              CreateMaterials() ;                     // defines the material of the detector
-  virtual  AliPHOSRecPoint::RecPointsList *  EmcRecPoints() {
+  virtual void   AddHit(Int_t, Int_t*, Float_t *) {
+    // do not used this definition but the one below
+    assert(0==1) ; 
+  }
+  virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) = 0 ;   
+  virtual void   CreateMaterials() ;                     
+  virtual  AliPHOSRecPoint::RecPointsList **  EmcRecPoints() {
     // Getting list of RecPoints
-    return fEmcRecPoints ;
+    return &fEmcRecPoints ;
   }
   virtual  AliPHOSGeometry * GetGeometry() = 0 ;
-  virtual   AliPHOSRecPoint::RecPointsList *    PpsdRecPoints()=0;// gets Array of clusters in the PPSD 
-  virtual void               SetTreeAddress();                 // Tree Address for reconstruction lists
-  virtual  AliPHOSRecParticle::RecParticlesList *  RecParticles() {
+  virtual void Hit2Digit(){}  // Will convert hits to digits in versions v1 etc
+
+  virtual Int_t   IsVersion(void) const { return -1 ; } 
+  virtual  AliPHOSRecPoint::RecPointsList ** PpsdRecPoints() {
+    // to be redefined when ppsd is present
+    return & fPpsdRecPoints ;
+  } 
+  virtual void  SetTreeAddress();                
+  virtual  AliPHOSRecParticle::RecParticlesList **  RecParticles() {
     // Getting list of RecParticles
-    return fRecParticles ;
+    return & fRecParticles ;
   }
-  virtual  AliPHOSTrackSegment::TrackSegmentsList *  TrackSegments() {
+  virtual  AliPHOSTrackSegment::TrackSegmentsList **  TrackSegments() {
     // Getting list of TrackSegments
-    return fTrackSegments ;
+    return & fTrackSegments ;
   }
   virtual TString Version() {return TString(" ") ; } 
  
@@ -61,12 +69,12 @@ class AliPHOS : public AliDetector {
     return *this ; 
   }
  
- protected:
-  
-  AliPHOSRecPoint::RecPointsList * fEmcRecPoints ;         // The RecPoints (clusters) list in EMC 
-  AliPHOSTrackSegment::TrackSegmentsList * fTrackSegments ;// The TrackSegment list in PHOS
-  AliPHOSRecParticle::RecParticlesList * fRecParticles ;   // The reconstructed particles list in PHOS
-
+protected:
+  TClonesArray                           *fSDigits      ; // List of summable digits
+  AliPHOSRecPoint::RecPointsList         *fEmcRecPoints ; // The RecPoints (clusters) list in EMC 
+  AliPHOSRecPoint::RecPointsList         *fPpsdRecPoints ;// The RecPoints (clusters) list in PPSD (veto)
+  AliPHOSTrackSegment::TrackSegmentsList *fTrackSegments ;// The TrackSegment list in PHOS
+  AliPHOSRecParticle::RecParticlesList   *fRecParticles ; // The reconstructed particles list in PHOS
 
   ClassDef(AliPHOS,2) // Photon Spectrometer Detector (base class)