Correction for left over bugs after ParticleGuesser has been removed and replaced...

diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h
index 0d077f1b9a47c109149947e1b0760cbc616fd3ec..39640ec43177af78fd1d7fa3d7f50793094839f8 100644 (file)
--- a/PHOS/AliPHOSPID.h
+++ b/PHOS/AliPHOSPID.h
@@ -36,9 +36,9 @@ public:
   AliPHOSPID() ;          // ctor            
   virtual ~AliPHOSPID() ; // dtor
 
-  virtual void GuessParticleType(TrackSegmentsList * trsl, RecParticlesList * rpl) {} ; 
+  virtual void GetParticleType(TrackSegmentsList * trsl, RecParticlesList * rpl) {} ; 
 
-  ClassDef(AliPHOSPID,1)  // Particle Guesser interface, version 1
+  ClassDef(AliPHOSPID,1)  // Particle Identifier interface, version 1
 
 } ;
 

diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h
index cf1ee9a173a8e5811d484b5b7810157ae1efe325..117107a0ea9c5164ee353f2080f6322cd062b0ff 100644 (file)
--- a/PHOS/AliPHOSPIDv1.h
+++ b/PHOS/AliPHOSPIDv1.h
@@ -9,7 +9,7 @@
 //  Particle Identifier   class for PHOS         //
 //  Version SUBATECH                             //
 //  Author Yves Schutz                           //
-//     comment: guess the type of particle       //  
+//     comment: identify the type of particle    //  
 //              PHOS SubTrack alone              //
 ///////////////////////////////////////////////////
 

diff --git a/PHOS/AliPHOSReconstructioner.cxx b/PHOS/AliPHOSReconstructioner.cxx
index c93483db7e3fa98d8839563249d1415fde420c17..eea1e4aca96c8a197cec74a748077d9c3a0dfd12 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.cxx
+++ b/PHOS/AliPHOSReconstructioner.cxx
@@ -41,11 +41,11 @@ AliPHOSReconstructioner::AliPHOSReconstructioner()
 //____________________________________________________________________________
 AliPHOSReconstructioner::AliPHOSReconstructioner(AliPHOSClusterizer * Clusterizer, 
                                                 AliPHOSTrackSegmentMaker * Tracker,
-                                                AliPHOSParticleGuesser * Guesser)
+                                                AliPHOSPID * Pid)
 {
   fClusterizer        = Clusterizer ;
   fTrackSegmentMaker  = Tracker ;
-  fParticleGuesser    = Guesser ; 
+  fPID                = Pid ; 
 } 
 
 //____________________________________________________________________________
@@ -57,11 +57,11 @@ AliPHOSReconstructioner::~AliPHOSReconstructioner()
 //____________________________________________________________________________
  void AliPHOSReconstructioner::Init(AliPHOSClusterizer * Clusterizer, 
                                                 AliPHOSTrackSegmentMaker * Tracker,
-                                                AliPHOSParticleGuesser * Guesser)
+                                                AliPHOSPID * Pid)
 {
   fClusterizer        = Clusterizer ;
   fTrackSegmentMaker  = Tracker ;
-  fParticleGuesser    = Guesser ; 
+  fPID                = Pid ; 
 } 
 
 
@@ -75,5 +75,5 @@ AliPHOSReconstructioner::~AliPHOSReconstructioner()
 
   fTrackSegmentMaker->MakeTrackSegments(dl, emccl, ppsdl, trsl) ;
 
-  fParticleGuesser->GuessParticleType(trsl, rpl) ; 
+  fPID->GetParticleType(trsl, rpl) ; 
 }

diff --git a/PHOS/AliPHOSv0.h b/PHOS/AliPHOSv0.h
index f650523761a6e02523844d11babb8c6994771e6a..3f8f292e84677d2aa0cf397ac1a98dc472cfbcf2 100644 (file)
--- a/PHOS/AliPHOSv0.h
+++ b/PHOS/AliPHOSv0.h
@@ -19,7 +19,7 @@
 #include "AliPHOSGeometry.h"
 #include "AliPHOSReconstructioner.h"
 #include "AliPHOSTrackSegmentMaker.h"
-#include "AliPHOSParticleGuesser.h"
+#include "AliPHOSPID.h"
 
 class AliPHOSv0 : public AliPHOS {
 

diff --git a/PHOS/PHOSHistos.cxx b/PHOS/PHOSHistos.cxx
index 7d5274280ab64e6a29988941467e028aa52018d0..e12d287c9d948512a9656c19635cdfef673ab6f3 100644 (file)
--- a/PHOS/PHOSHistos.cxx
+++ b/PHOS/PHOSHistos.cxx
@@ -60,7 +60,7 @@ void PHOSHistos (Text_t* infile, Int_t nevent, Int_t Module)
   AliPHOSTrackSegmentMakerv1 * tracksegmentmaker = new AliPHOSTrackSegmentMakerv1() ;
   //========== Creates the particle identifier
   AliPHOSPIDv1 * particleidentifier = new AliPHOSPIDv1 ;
-  cout <<  "AnalyzeOneEvent > using particle guess " << particleidentifier->GetName() << endl ; 
+  cout <<  "AnalyzeOneEvent > using particle identifier " << particleidentifier->GetName() << endl ; 
     
   TH1F * hEmcDigit       = new TH1F("hEmcDigit","hEmcDigit",1000,0.,5.);
   TH1F * hVetoDigit      = new TH1F("hVetoDigit","hVetoDigit",1000,0.,3.e-5);