Rename AliPHOSReconstructioner to AliPHOSReconstructor

diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx
index 66c7b46be27bafa52b2cf36c5f3a789cfb1123bf..035b0dd99574f00671f4a793611f215452ffe37e 100644 (file)
--- a/PHOS/AliPHOS.cxx
+++ b/PHOS/AliPHOS.cxx
@@ -43,7 +43,7 @@ class TFile;
 #include "AliRun.h"
 #include "AliPHOSDigitizer.h"
 #include "AliPHOSSDigitizer.h"
-#include "AliPHOSReconstructioner.h"
+#include "AliPHOSReconstructor.h"
 ClassImp(AliPHOS)
 //____________________________________________________________________________
 AliPHOS:: AliPHOS() : AliDetector()
@@ -382,7 +382,7 @@ void AliPHOS::FillESD(AliESD* esd) const
   // Called by AliReconstruct after Reconstruct() and global tracking and vertxing
 
   //Creates the tracksegments and Recparticles
-  AliPHOSReconstructioner * rec = new AliPHOSReconstructioner((fLoader->GetRunLoader()->GetFileName()).Data()) ; 
+  AliPHOSReconstructor * rec = new AliPHOSReconstructor((fLoader->GetRunLoader()->GetFileName()).Data()) ; 
   TList * taskslist = rec->GetListOfTasks() ; 
   Int_t index ;
   TTask * task ; 
@@ -477,7 +477,7 @@ void AliPHOS::Reconstruct() const
   // segment maker needs access to the AliESD object to retrieve the tracks reconstructed by 
   // the global tracking.
  
-  AliPHOSReconstructioner * rec = new AliPHOSReconstructioner((fLoader->GetRunLoader()->GetFileName()).Data()) ; 
+  AliPHOSReconstructor * rec = new AliPHOSReconstructor((fLoader->GetRunLoader()->GetFileName()).Data()) ; 
   TList * taskslist = rec->GetListOfTasks() ; 
   Int_t index ;
   TTask * task ; 

diff --git a/PHOS/AliPHOSDebug.cxx b/PHOS/AliPHOSDebug.cxx
index 37855287de6353169fc11586b374ef549992b39d..4b420344dee3a3a052d1ac220d229e1ce39d02c6 100644 (file)
--- a/PHOS/AliPHOSDebug.cxx
+++ b/PHOS/AliPHOSDebug.cxx
@@ -44,7 +44,7 @@
 #include "AliPHOSv1.h"
 #include "AliPHOSHit.h"
 #include "AliPHOSDigit.h"
-#include "AliPHOSReconstructioner.h"
+#include "AliPHOSReconstructor.h"
 #include "AliRun.h"
 #include "AliConst.h"
 
@@ -97,7 +97,7 @@ AliPHOSv0(name,title)
 }
 
 //____________________________________________________________________________
-AliPHOSv1::AliPHOSv1(AliPHOSReconstructioner * Reconstructioner, const char *name, const char *title):
+AliPHOSv1::AliPHOSv1(AliPHOSReconstructor * Reconstructioner, const char *name, const char *title):
   AliPHOSv0(name,title)
 {
   // ctor : title is used to identify the layout
@@ -430,7 +430,7 @@ void AliPHOSv1::MakeBranch(Option_t* opt, char *file)
 }
 
 //_____________________________________________________________________________
-void AliPHOSv1::Reconstruction(AliPHOSReconstructioner * Reconstructioner)
+void AliPHOSv1::Reconstruction(AliPHOSReconstructor * Reconstructioner)
 { 
   // 1. Reinitializes the existing RecPoint, TrackSegment, and RecParticles Lists and 
   // 2. Creates TreeR with a branch for each list

diff --git a/PHOS/AliPHOSDebug.h b/PHOS/AliPHOSDebug.h
index 1eadecb424b1c288f665f6d9ae2454c7d63f3d0e..3021dc5e9e3606e8e5ec04dad750b100e369f3b5 100644 (file)
--- a/PHOS/AliPHOSDebug.h
+++ b/PHOS/AliPHOSDebug.h
@@ -17,7 +17,7 @@ class TFile;
 // --- AliRoot header files ---
 #include "AliPHOSv0.h"
 #include "AliPHOSGeometry.h"
-#include "AliPHOSReconstructioner.h"
+#include "AliPHOSReconstructor.h"
 #include "AliPHOSTrackSegmentMaker.h"
 #include "AliPHOSPID.h"
 #include "AliPHOSCPVDigit.h"
@@ -28,7 +28,7 @@ public:
 
   AliPHOSv1(void) ;
   AliPHOSv1(const char *name, const char *title="") ;
-  AliPHOSv1(AliPHOSReconstructioner * Reconstructioner, const char *name, const char *title="") ;
+  AliPHOSv1(AliPHOSReconstructor * Reconstructioner, const char *name, const char *title="") ;
   AliPHOSv1(const AliPHOSv1 & phos) {
     // cpy ctor: no implementation yet
     // requested by the Coding Convention
@@ -41,7 +41,7 @@ public:
   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           Reconstruction(AliPHOSReconstructor * Reconstructioner) ;
   void           ResetClusters(){} ;
   virtual void   SDigits2Digits() ;  
   virtual Int_t  IsVersion(void) const {
@@ -50,7 +50,7 @@ public:
   }
 
   virtual void   ResetReconstruction() ; // Reset reconstructed objects
-  void           SetReconstructioner(AliPHOSReconstructioner& Reconstructioner) {
+  void           SetReconstructioner(AliPHOSReconstructor& Reconstructioner) {
     // sets the reconstructionner object to be used
     fReconstructioner = &Reconstructioner ;
   }  
@@ -83,7 +83,7 @@ protected:
   Float_t fDigitizeA ;                            //Parameters of the 
   Float_t fDigitizeB ;                            //digitization 
   Int_t   fnSdigits ; 
-  AliPHOSReconstructioner  * fReconstructioner ;  // Clusterization and subtracking procedures
+  AliPHOSReconstructor  * fReconstructioner ;  // Clusterization and subtracking procedures
   AliPHOSTrackSegmentMaker * fTrackSegmentMaker ; // Reconstructioner of the PHOS track segment: 2 x PPSD + 1 x EMC
 
   ClassDef(AliPHOSv1,1)  // Implementation of PHOS manager class for layout EMC+PPSD

diff --git a/PHOS/AliPHOSReconstructionTest.C b/PHOS/AliPHOSReconstructionTest.C
index 5a4c0d36721943dd7094e4b331c36a8225a8f205..da28aa01ba0e42ca5c6d67f4b31e8e2ca5d9371d 100644 (file)
--- a/PHOS/AliPHOSReconstructionTest.C
+++ b/PHOS/AliPHOSReconstructionTest.C
@@ -3,26 +3,26 @@
 
 #include "TString.h"
 
-#include "PHOS/AliPHOSReconstructioner.h"
+#include "PHOS/AliPHOSReconstructor.h"
 #endif
 
 void Go(TString deb = ""){
-  AliPHOSReconstructioner * a ;   
+  AliPHOSReconstructor * a ;   
 
   cout << "AliPHOS:> Single File default reconstruction started" << endl ;
-  a = new AliPHOSReconstructioner("galice.root") ;  //first -single file default reconstruction
+  a = new AliPHOSReconstructor("galice.root") ;  //first -single file default reconstruction
   a->ExecuteTask(deb.Data()) ;
   cout << "AliPHOS:> Single File default reconstruction finished" << endl ;
   // delete a ; 
 
   cout << "AliPHOS:> Single File branch TEST reconstruction started" << endl ;
-  a = new AliPHOSReconstructioner("galice.root","test") ;  //another branch single file recontruction
+  a = new AliPHOSReconstructor("galice.root","test") ;  //another branch single file recontruction
   a->ExecuteTask(deb.Data()) ;
   cout << "AliPHOS:> Single File branch TEST reconstruction ended" << endl ;
   //delete a ; 
   
   cout << "AliPHOS:> Split File default reconstruction started" << endl ;
-  a = new AliPHOSReconstructioner("galice.root","Default",kTRUE) ; //Split file default reconstruction
+  a = new AliPHOSReconstructor("galice.root","Default",kTRUE) ; //Split file default reconstruction
   a->ExecuteTask(deb.Data()) ;
   cout << "AliPHOS:> Split File default reconstruction ended" << endl ;
   //delete a ; 

diff --git a/PHOS/AliPHOSReconstructioner.cxx b/PHOS/AliPHOSReconstructor.cxx
similarity index 90%
rename from PHOS/AliPHOSReconstructioner.cxx
rename to PHOS/AliPHOSReconstructor.cxx
index 041596be10c0d3f9aa01f4c54cd6a669207acb21..6a60e95a85366b06250112998cbd2fd189529ef0 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.cxx
+++ b/PHOS/AliPHOSReconstructor.cxx
@@ -33,7 +33,7 @@
 //
 //  Use case: 
 //
-//  root [0] AliPHOSReconstructioner * r = new AliPHOSReconstructioner("galice.root")
+//  root [0] AliPHOSReconstructor * r = new AliPHOSReconstructor("galice.root")
 //              //  Set the header file
 //  root [1] r->ExecuteTask() 
 //              //  Make full chain of reconstruction
@@ -64,17 +64,17 @@
 // --- AliRoot header files ---
 #include "AliESD.h"
 #include "AliESDCaloTrack.h"
-#include "AliPHOSReconstructioner.h"
+#include "AliPHOSReconstructor.h"
 #include "AliPHOSClusterizerv1.h"
 #include "AliPHOSTrackSegmentMakerv1.h"
 #include "AliPHOSPIDv1.h"
 #include "AliPHOSGetter.h"
 
 
-ClassImp(AliPHOSReconstructioner)
+ClassImp(AliPHOSReconstructor)
 
 //____________________________________________________________________________
-  AliPHOSReconstructioner::AliPHOSReconstructioner():TTask("AliPHOSReconstructioner","")
+  AliPHOSReconstructor::AliPHOSReconstructor():TTask("AliPHOSReconstructor","")
 {
   // ctor
   fClusterizer = 0 ;
@@ -87,8 +87,8 @@ ClassImp(AliPHOSReconstructioner)
 } 
 
 //____________________________________________________________________________
-AliPHOSReconstructioner::AliPHOSReconstructioner(const char* evFoldName,const char * branchName,const TString taskName):
-TTask("AliPHOSReconstructioner",evFoldName)
+AliPHOSReconstructor::AliPHOSReconstructor(const char* evFoldName,const char * branchName,const TString taskName):
+TTask("AliPHOSReconstructor",evFoldName)
 {
   // Create a PHOS reconstructioner for the tasks defined by taskName
   // "C" - clusterization
@@ -118,7 +118,7 @@ TTask("AliPHOSReconstructioner",evFoldName)
   fIsInitialized = kTRUE ;
 } 
 //____________________________________________________________________________
-void AliPHOSReconstructioner::Exec(Option_t *opt)
+void AliPHOSReconstructor::Exec(Option_t *opt)
 {
   //check, if the names of branches, which should be made coincide with already
   //existing
@@ -128,7 +128,7 @@ void AliPHOSReconstructioner::Exec(Option_t *opt)
     Init() ;
 }
 //____________________________________________________________________________
-void AliPHOSReconstructioner:: Clusters2Tracks(Int_t ievent, AliESD *event)
+void AliPHOSReconstructor:: Clusters2Tracks(Int_t ievent, AliESD *event)
 {
   // Convert PHOS reconstructed particles into ESD object for event# ievent.
   // ESD object is returned as an argument event
@@ -154,7 +154,7 @@ void AliPHOSReconstructioner:: Clusters2Tracks(Int_t ievent, AliESD *event)
   
 }
 //____________________________________________________________________________
- void AliPHOSReconstructioner::Init()
+ void AliPHOSReconstructor::Init()
 {
   // initiliaze Reconstructioner if necessary: we can not do this in default constructor
 
@@ -178,16 +178,16 @@ void AliPHOSReconstructioner:: Clusters2Tracks(Int_t ievent, AliESD *event)
   }
 } 
 //____________________________________________________________________________
-AliPHOSReconstructioner::~AliPHOSReconstructioner()
+AliPHOSReconstructor::~AliPHOSReconstructor()
 {
   // Delete data members if any
 } 
 
-void AliPHOSReconstructioner::Print()const {
+void AliPHOSReconstructor::Print()const {
   // Print reconstructioner data  
 
   TString message ; 
-  message  = "-----------------AliPHOSReconstructioner---------------\n" ;
+  message  = "-----------------AliPHOSReconstructor---------------\n" ;
   message += " Reconstruction of the header file %s\n" ;
   message += " with the following modules:\n" ;
 
@@ -210,7 +210,7 @@ void AliPHOSReconstructioner::Print()const {
 }
 
 //____________________________________________________________________________
-void AliPHOSReconstructioner::SetEventRange(Int_t first, Int_t last)
+void AliPHOSReconstructor::SetEventRange(Int_t first, Int_t last)
 {
   // Set the event range to process
   fFirstEvent=first; 

diff --git a/PHOS/AliPHOSReconstructioner.h b/PHOS/AliPHOSReconstructor.h
similarity index 76%
rename from PHOS/AliPHOSReconstructioner.h
rename to PHOS/AliPHOSReconstructor.h
index a5a41ef5fd8f9617a5d63780f481187715ba490f..14548c9477da5373e06905cd7e54d8bcb8603d9a 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.h
+++ b/PHOS/AliPHOSReconstructor.h
@@ -1,5 +1,5 @@
-#ifndef ALIPHOSRECONSTRUCTIONER_H
-#define ALIPHOSRECONSTRUCTIONER_H
+#ifndef ALIPHOSRECONSTRUCTOR_H
+#define ALIPHOSRECONSTRUCTOR_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -25,19 +25,19 @@ class AliESD ;
 
 // --- AliRoot header files ---
 
-class AliPHOSReconstructioner : public TTask {
+class AliPHOSReconstructor : public TTask {
 
 public:
 
-  AliPHOSReconstructioner() ; //ctor            
-  AliPHOSReconstructioner(const char * headerFile, const char * branchName = "Default",const TString taskName="CTP");
-  AliPHOSReconstructioner(const AliPHOSReconstructioner & rec) : TTask(rec) {
+  AliPHOSReconstructor() ; //ctor            
+  AliPHOSReconstructor(const char * headerFile, const char * branchName = "Default",const TString taskName="CTP");
+  AliPHOSReconstructor(const AliPHOSReconstructor & rec) : TTask(rec) {
     // cpy ctor: 
     // requested by the Coding Convention
     Fatal("cpy ctor", "not implemented") ;
   }
    
-  virtual ~AliPHOSReconstructioner() ;
+  virtual ~AliPHOSReconstructor() ;
 
   virtual void Exec(Option_t *) ;
   void Clusters2Tracks(Int_t ievent, AliESD *event);
@@ -49,7 +49,7 @@ public:
 
   void Print()const ;
 
-  AliPHOSReconstructioner & operator = (const AliPHOSReconstructioner & /*rvalue*/)  {
+  AliPHOSReconstructor & operator = (const AliPHOSReconstructor & /*rvalue*/)  {
     // assignement operator requested by coding convention but not needed
     Fatal("operator =", "not implemented") ;
     return *this ; 
@@ -73,8 +73,8 @@ private:
   Int_t   fFirstEvent;        // first event to process
   Int_t   fLastEvent;         // last  event to process
  
-  ClassDef(AliPHOSReconstructioner,1)  // Reconstruction algorithm class (Base Class)
+  ClassDef(AliPHOSReconstructor,1)  // Reconstruction algorithm class (Base Class)
 
 }; 
 
-#endif // ALIPHOSRECONSTRUCTIONER_H
+#endif // ALIPHOSRECONSTRUCTOR_H

diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
index 1ba124b70d9c61df843a8231d21a9f1593fbf2bb..51e0af564ab1900aacc5df87b5d5a47d74f10727 100644 (file)
--- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx
+++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx
@@ -28,7 +28,7 @@
 //   new TrackSegment. 
 // If there is no CPV/PPSD RecPoint we make TrackSegment 
 // consisting from EMC alone. There is no TrackSegments without EMC RecPoint.
-//// In principle this class should be called from AliPHOSReconstructioner, but 
+//// In principle this class should be called from AliPHOSReconstructor, but 
 // one can use it as well in standalone mode.
 // Use  case:
 //  root [0] AliPHOSTrackSegmentMakerv1 * t = new AliPHOSTrackSegmentMaker("galice.root", "tracksegmentsname", "recpointsname")

diff --git a/PHOS/Digits2RecParticles.C b/PHOS/Digits2RecParticles.C
index 9186a1297d3eece62fa8712856b6ad2703e650c9..34e149a446fdaed140edc75cc5eb01b6f992f8be 100644 (file)
--- a/PHOS/Digits2RecParticles.C
+++ b/PHOS/Digits2RecParticles.C
@@ -26,7 +26,7 @@ void Digits2RecParticles(){
   fPID->SetShowerProfileCuts(0.3, 1.8, 0.3, 1.8 ) ;       
       
   //========== Creates the Reconstructioner
-  AliPHOSReconstructioner * fRec = new AliPHOSReconstructioner(fClu, fTrs, fPID) ; 
+  AliPHOSReconstructor * fRec = new AliPHOSReconstructor(fClu, fTrs, fPID) ; 
   // fRec -> SetDebugReconstruction(kTRUE);     
      
   gAlice->GetEvent(0) ;

diff --git a/PHOS/PHOSHistos.cxx b/PHOS/PHOSHistos.cxx
index 01e665e522581b0d1b787d22f5f76c0f90d83b07..30fc014fb26f0b71c947497c094212901ebeef79 100644 (file)
--- a/PHOS/PHOSHistos.cxx
+++ b/PHOS/PHOSHistos.cxx
@@ -39,7 +39,7 @@
 #include "AliPHOSEmcRecPoint.h"
 #include "AliPHOSPpsdRecPoint.h"
 #include "AliPHOSClusterizerv1.h"
-#include "AliPHOSReconstructioner.h"
+#include "AliPHOSReconstructor.h"
 #include "AliPHOSTrackSegment.h"
 #include "AliPHOSTrackSegmentMakerv1.h"
 #include "AliPHOSPIDv1.h"
@@ -85,7 +85,7 @@ void PHOSHistos (Text_t* infile, Int_t nevent, Int_t Module)
     clusterizer->SetCalibrationParameters(0., 0.00000001) ;
 
   //========== Creates the Reconstructioner  
-    AliPHOSReconstructioner * Reconstructioner = new AliPHOSReconstructioner(clusterizer, tracksegmentmaker, particleidentifier) ;
+    AliPHOSReconstructor * Reconstructioner = new AliPHOSReconstructor(clusterizer, tracksegmentmaker, particleidentifier) ;
      
     Info("PHOSHistos", "Event %d\n", ievent);
 

diff --git a/PHOS/PHOSLinkDef.h b/PHOS/PHOSLinkDef.h
index de3e0886e366dff35ea20ef65f10e4f1408dd34b..ebd44ec423acc6756f236ce3264f5f808ff5a0bc 100644 (file)
--- a/PHOS/PHOSLinkDef.h
+++ b/PHOS/PHOSLinkDef.h
@@ -18,7 +18,7 @@
 #pragma link C++ class AliPHOSvImpacts+;
 #pragma link C++ class AliPHOSImpact+;
 #pragma link C++ class AliPHOSLink+;
-#pragma link C++ class AliPHOSReconstructioner+;
+#pragma link C++ class AliPHOSReconstructor+;
 #pragma link C++ class AliPHOSRecPoint+;
 #pragma link C++ class AliPHOSSDigitizer+;
 #pragma link C++ class AliPHOSDigitizer+;

diff --git a/PHOS/libPHOS.pkg b/PHOS/libPHOS.pkg
index 26b595acbae2d6a5457bc215d0619c45d632cf0f..178ee3eba6eb51493f662eb2d19221bb364a5d97 100644 (file)
--- a/PHOS/libPHOS.pkg
+++ b/PHOS/libPHOS.pkg
@@ -11,7 +11,7 @@ SRCS          =    AliPHOS.cxx AliPHOSv0.cxx AliPHOSv1.cxx AliPHOSv2.cxx \
                  AliPHOSCpvRecPoint.cxx \
                  AliPHOSClusterizer.cxx AliPHOSClusterizerv1.cxx  \
                  AliPHOSLink.cxx AliPHOSSDigitizer.cxx AliPHOSDigitizer.cxx\
-                 AliPHOSReconstructioner.cxx  AliPHOSTrackSegment.cxx \
+                 AliPHOSReconstructor.cxx  AliPHOSTrackSegment.cxx \
                  AliPHOSTrackSegmentMaker.cxx AliPHOSTrackSegmentMakerv1.cxx \
                  AliPHOSRecParticle.cxx AliPHOSPID.cxx AliPHOSPIDv0.cxx \
                  AliPHOSAnalyze.cxx AliPHOSFastRecParticle.cxx \