a few modifications to satisty aCC

diff --git a/PHOS/AliPHOS.h b/PHOS/AliPHOS.h
index 849bd4a143354787c02ce6045f902f75a93b584c..2c7faaf273e40c9637ac99f1692152413bc17e78 100644 (file)
--- a/PHOS/AliPHOS.h
+++ b/PHOS/AliPHOS.h
@@ -35,15 +35,19 @@ class AliPHOS : public AliDetector {
     assert(0==1) ; 
   }
   virtual ~AliPHOS() ; 
- 
-  virtual  void              CreateMaterials() ;                     // defines the material of the detector
+  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 ;
   }
   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  AliPHOSRecPoint::RecPointsList * PpsdRecPoints()=0;
+  virtual void  SetTreeAddress();                
   virtual  AliPHOSRecParticle::RecParticlesList *  RecParticles() {
     // Getting list of RecParticles
     return fRecParticles ;

diff --git a/PHOS/AliPHOSFastRecParticle.cxx b/PHOS/AliPHOSFastRecParticle.cxx
index 12bcaca3e53dbb36e9d564e3ac783d171e39f0a4..7db43b930bd4379f5d993a14b0ad50d40023b4fe 100644 (file)
--- a/PHOS/AliPHOSFastRecParticle.cxx
+++ b/PHOS/AliPHOSFastRecParticle.cxx
@@ -222,7 +222,7 @@ void AliPHOSFastRecParticle::Paint(Option_t *)
 }
 
 //____________________________________________________________________________
-void AliPHOSFastRecParticle::Print()
+void AliPHOSFastRecParticle::Print(const char * opt)
 {
   // Print the typr, energy and momentum
   

diff --git a/PHOS/AliPHOSFastRecParticle.h b/PHOS/AliPHOSFastRecParticle.h
index 6b8b985d36b9fad98a15eb844077aa23e60eb81f..268fcec52f712f0dd54f90fe8be3ce463338392a 100644 (file)
--- a/PHOS/AliPHOSFastRecParticle.h
+++ b/PHOS/AliPHOSFastRecParticle.h
@@ -46,7 +46,7 @@ class AliPHOSFastRecParticle : public TParticle {
   } 
   TString Name() ; 
   virtual void Paint(Option_t * option="");
-  void Print() ; 
+  virtual void Print(const char *) ; 
   void SetPrimary(Int_t index) { 
     // sets the primary particle index
     fPrimary = index ; 

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index 8a0d43c0a9e50d15abadf2d7d484c3d0d75ca5c1..dd16d3ae567b569477db028baa32347fd6db9fbd 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -86,7 +86,7 @@ void  AliPHOSPIDv1::MakeParticles(AliPHOSTrackSegment::TrackSegmentsList * trsl,
 }
 
 //____________________________________________________________________________
-void  AliPHOSPIDv1:: Print() 
+void  AliPHOSPIDv1:: Print(const char * opt) 
 {
   // Print the parameters used for the particle type identification
   

diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h
index e1fc791f64580bd0e2bc318810a5c75f8e455e52..c429f310c5d411c621f9ba70910548737fbbc7eb 100644 (file)
--- a/PHOS/AliPHOSPIDv1.h
+++ b/PHOS/AliPHOSPIDv1.h
@@ -29,7 +29,7 @@ public:
 
   virtual void MakeParticles(AliPHOSTrackSegment::TrackSegmentsList * trsl, 
                             AliPHOSRecParticle::RecParticlesList * rpl ) ; // does the job
-  void Print() ; 
+  virtual void Print(const char *) ; 
   virtual void SetDispersionCutOff(Float_t Dcut) {fCutOnDispersion = Dcut ; }    
   virtual void SetShowerProfileCuts(Float_t l1m, Float_t l1M, Float_t l2m, Float_t l2M) ; 
 

diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h
index 2f936263174cde83a7456f1275761a519d8dcd7d..8d3c9f17ef7a97ef155131935a1cdfb4cab6b55a 100644 (file)
--- a/PHOS/AliPHOSRecPoint.h
+++ b/PHOS/AliPHOSRecPoint.h
@@ -37,6 +37,10 @@ class AliPHOSRecPoint : public AliRecPoint {
   virtual ~AliPHOSRecPoint(){
     // dtor
   }
+  virtual  void   AddDigit(AliDigitNew &){
+    // do not use this definition but the one below
+    assert(0==1) ; 
+  }
   virtual  void   AddDigit(AliPHOSDigit & digit, Float_t Energy) = 0 ; 
   virtual Int_t   Compare(TObject * obj) { 
     // check why this is done

diff --git a/PHOS/AliPHOSTrackSegment.cxx b/PHOS/AliPHOSTrackSegment.cxx
index 406d7ba07f11d9b1cbdae29af9a3603d956363e8..2a377ac5ff96f504788666c6326315bb8f5eb3d4 100644 (file)
--- a/PHOS/AliPHOSTrackSegment.cxx
+++ b/PHOS/AliPHOSTrackSegment.cxx
@@ -477,7 +477,7 @@ void AliPHOSTrackSegment::Paint(Option_t *)
 }
 
 //____________________________________________________________________________
-void AliPHOSTrackSegment::Print()
+void AliPHOSTrackSegment::Print(const char * opt)
 {
   // Print all information on this track Segment
   

diff --git a/PHOS/AliPHOSTrackSegment.h b/PHOS/AliPHOSTrackSegment.h
index 5570908f562bbf3ecdd273c9020254e02d656760..01f169db887be01f9c3cc3181a91b4ceed96f5fd 100644 (file)
--- a/PHOS/AliPHOSTrackSegment.h
+++ b/PHOS/AliPHOSTrackSegment.h
@@ -73,7 +73,7 @@ public:
     return fPpsdUpRecPoint ; 
   }
   virtual void  Paint(Option_t * option="");
-  void    Print() ;
+  virtual void  Print(const char *) ;
   void    SetIndexInList(Int_t val) { 
     // sets the index value  of this in the list 
     fIndexInList = val ; 

diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h
index da40d3099621b9d488035eac774b025170cedb95..6825e83dd845fb6a6819df89124fcd309c78d76c 100644 (file)
--- a/PHOS/AliPHOSv1.h
+++ b/PHOS/AliPHOSv1.h
@@ -31,13 +31,11 @@ public:
     // 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 ) ; 
-         // adds a pre-digitilized hit to the hit tree 
   Int_t          Digitize(Float_t Energy);
-  virtual void   FinishEvent(void) ;                                // makes the digits from the hits 
+  virtual void   FinishEvent(void) ;                               
   Int_t IsVersion(void) const { return 1 ; }
   virtual void   MakeBranch(Option_t* opt) ;
   virtual  AliPHOSRecPoint::RecPointsList *  PpsdRecPoints() {
@@ -48,11 +46,17 @@ public:
   void           ResetClusters(){} ;
   virtual void   ResetDigits() ; 
   virtual void   ResetReconstruction() ; // Reset reconstructed objects
-  void           SetReconstructioner(AliPHOSReconstructioner& Reconstructioner) {fReconstructioner = &Reconstructioner ;} 
+  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) ;                                // does the tracking through PHOS and a preliminary digitalization
-  virtual TString Version(void){ return TString("v1"); }
+  virtual void   StepManager(void) ;                              
+  virtual TString Version(void){ 
+    // returns the version number 
+    return TString("v1") ; 
+  }
 
   AliPHOSv1 & operator = (const AliPHOSv1 & rvalue)  {
     // assignement operator requested by coding convention