Removed the SDigits and Digits steps. Reconstruction starts with Digits and ends...

Removed the Loader shit and hide it in he Getter

diff --git a/EMCAL/AliEMCALReconstructioner.cxx b/EMCAL/AliEMCALReconstructioner.cxx
index fef015ecb49fb5b8a75879cbe12805ea3b4f8b2e..dd514a5fc3492aab41597cc088051f5534a4d703 100644 (file)
--- a/EMCAL/AliEMCALReconstructioner.cxx
+++ b/EMCAL/AliEMCALReconstructioner.cxx
@@ -52,39 +52,31 @@
 //
 //             // And finally one can call ExecuteTask() with the following options
 //  root [5] r->ExecuteTask("debug all timing")
-//             // deb     - prints the numbers of produced SDigits, Digits etc.
-//             // deb all - prints in addition list of made SDigits, digits etc.
+//             // deb     - prints the numbers of RecPoints and RecParticles
+//             // deb all - prints in addition list of RecPoints and RecParticles
 //             // timing  - prints benchmarking results
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // --- ROOT system ---
 
 // --- Standard library ---
-#include "Riostream.h"
 
 // --- AliRoot header files ---
-#include "AliRunLoader.h"
 #include "AliESD.h"
 #include "AliESDCaloTrack.h"
 #include "AliEMCALReconstructioner.h"
 #include "AliEMCALClusterizerv1.h"
-#include "AliEMCALDigitizer.h"
-#include "AliEMCALSDigitizer.h"
 #include "AliEMCALPIDv1.h"
 #include "AliEMCALGetter.h"
 
-#include "AliEMCALLoader.h"
-
 ClassImp(AliEMCALReconstructioner)
 
 //____________________________________________________________________________
   AliEMCALReconstructioner::AliEMCALReconstructioner():TTask("AliEMCALReconstructioner","")
 {
   // ctor
-  fDigitizer   = 0 ;
   fClusterizer = 0 ;
   fPID         = 0 ; 
-  fSDigitizer  = 0 ;
 
   fIsInitialized = kFALSE ;
 
@@ -95,69 +87,25 @@ AliEMCALReconstructioner::AliEMCALReconstructioner(const char* evFoldName,const
 TTask("AliEMCALReconstructioner",evFoldName)
 {
   // ctor
-  AliRunLoader* rl = AliRunLoader::GetRunLoader(evFoldName);
-  if (rl == 0x0)
-   {
-     Fatal("AliEMCALReconstructioner","Can not get Run Loader from folder %s.",evFoldName);
-   } 
-  if (rl->GetAliRun() == 0x0)
-   {
-     delete gAlice;
-     gAlice = 0x0;
-     rl->LoadgAlice();
-     gAlice = rl->GetAliRun();
-   }
-
-  AliEMCALLoader* gime = dynamic_cast<AliEMCALLoader*>(rl->GetLoader("EMCALLoader"));
-  if (gime == 0x0)
-   {
-     Error("AliEMCALReconstructioner","Can not get EMCAL Loader");
-     return;  
-   }
-  
-  TString galicefn = rl->GetFileName();
-  TString method("AliEMCALReconstructioner::AliEMCALReconstructioner(");
-  method = (((method + evFoldName)+",")+branchName)+"): ";
-  
-  fSDigitsBranch= branchName; 
   
-  //P.Skowronski remark
-  // Tasks has default fixed names
-  // other tasks can be added, even runtime
-  // with arbitrary name. See AliDataLoader::
-  cout<<"\n\n\n";
-  cout<<method<<"\n\nCreating SDigitizer\n";
-  fSDigitizer  = new AliEMCALSDigitizer(galicefn,GetTitle());
-  Add(fSDigitizer);
-  gime->PostSDigitizer(fSDigitizer);
-
-  fDigitsBranch=branchName ;
-  cout<<"\n\n\n";
-  cout<<method<<"\n\nCreating Digitizer\n";
-  fDigitizer   = new AliEMCALDigitizer(galicefn,GetTitle()) ;
-  Add(fDigitizer) ;
-  gime->PostDigitizer(fDigitizer);
+  AliEMCALGetter::Instance(evFoldName) ; 
 
   fRecPointBranch=branchName ; 
-  cout<<"\n\n\n";
-  cout<<method<<"Creating Clusterizer\n";
-  fClusterizer = new AliEMCALClusterizerv1(galicefn,GetTitle());
+  Info("ctor", "Creating Clusterizer") ;
+  fClusterizer = new AliEMCALClusterizerv1(evFoldName, GetTitle());
   Add(fClusterizer);
-  gime->PostReconstructioner(fClusterizer);
   
   fRecPartBranch=branchName ; 
-  cout<<"\n\n\n";
-  cout<<method<<"Creating PID\n";
-  fPID         = new AliEMCALPIDv1(galicefn,GetTitle());
+  Info("ctor", "Creating PID") ;
+  fPID         = new AliEMCALPIDv1(evFoldName, GetTitle());
   Add(fPID);
-  cout<<"\nFINISHED \n\n"<<method;
   
   fIsInitialized = kTRUE ;
 } 
 //____________________________________________________________________________
 void AliEMCALReconstructioner::Exec(Option_t *opt)
 {
-  //check, if the names of branches, which should be made conicide with already
+  //check, if the names of branches, which should be made coincide with already
   //existing
   if (!opt) 
     return ; 
@@ -193,15 +141,6 @@ void AliEMCALReconstructioner:: Clusters2Tracks(Int_t ievent, AliESD *event)
   // initiliaze Reconstructioner if necessary: we can not do this in default constructor
 
   if(!fIsInitialized){
-    // Initialisation
-
-    fSDigitsBranch="Default" ; 
-    fSDigitizer  = new AliEMCALSDigitizer(GetTitle(),fSDigitsBranch.Data()) ; 
-    Add(fSDigitizer) ;
-
-    fDigitsBranch="Default" ; 
-    fDigitizer   = new AliEMCALDigitizer(GetTitle(),fDigitsBranch.Data());
-    Add(fDigitizer) ;
 
     fRecPointBranch="Default" ; 
     fClusterizer = new AliEMCALClusterizerv1(GetTitle(),fRecPointBranch.Data());
@@ -221,6 +160,7 @@ AliEMCALReconstructioner::~AliEMCALReconstructioner()
   // Delete data members if any
 } 
 
+//____________________________________________________________________________
 void AliEMCALReconstructioner::Print()const {
   // Print reconstructioner data  
 
@@ -228,13 +168,6 @@ void AliEMCALReconstructioner::Print()const {
   message  = "-----------------AliEMCALReconstructioner---------------\n" ;
   message += " Reconstruction of the header file %s\n" ;
   message += " with the following modules:\n" ;
-
-  if(fSDigitizer->IsActive()){
-    message += "   (+)   %s to branch %s\n" ; 
-  }
-  if(fDigitizer->IsActive()){
-    message += "   (+)   %s to branch %s\n" ; 
-  }
   
   if(fClusterizer->IsActive()){
     message += "   (+)   %s to branch %s\n" ;
@@ -245,8 +178,6 @@ void AliEMCALReconstructioner::Print()const {
   }
   Info("Print", message.Data(), 
        GetTitle(), 
-       fSDigitizer->GetName(), fSDigitsBranch.Data(), 
-       fDigitizer->GetName(), fDigitsBranch.Data() , 
        fClusterizer->GetName(), fRecPointBranch.Data(), 
        fPID->GetName(), fRecPartBranch.Data() ) ; 
 }

diff --git a/EMCAL/AliEMCALReconstructioner.h b/EMCAL/AliEMCALReconstructioner.h
index dcdc54e9a9928ccb5315b2182e3ceeaa7e42e78a..af001507c6a26fa9f43deb305f8f4a4469a46efa 100644 (file)
--- a/EMCAL/AliEMCALReconstructioner.h
+++ b/EMCAL/AliEMCALReconstructioner.h
@@ -11,7 +11,6 @@
 //*-- Author: Yves Schutz (SUBATECH) 
 //*--         Dmitri Peressounko (SUBATECH & Kurchatov Institute)
 
-  //#include <stdlib.h>
 
 // --- ROOT system ---
 
@@ -31,7 +30,7 @@ class AliEMCALReconstructioner : public TTask {
 public:
 
   AliEMCALReconstructioner() ; //ctor            
-  AliEMCALReconstructioner(const char * headreFile, const char * branchName = "Default");
+  AliEMCALReconstructioner(const char * headerFile, const char * branchName = "Default");
   AliEMCALReconstructioner(const AliEMCALReconstructioner & rec) : TTask(rec) {
     // cpy ctor: 
     // requested by the Coding Convention
@@ -43,19 +42,10 @@ public:
   virtual void Exec(Option_t *) ;
   void Clusters2Tracks(Int_t ievent, AliESD *event);
 
-  AliEMCALDigitizer         * GetDigitizer()  const { return fDigitizer   ; }
   AliEMCALClusterizer       * GetClusterizer()const { return fClusterizer ; }
   AliEMCALPID               * GetPID()        const { return fPID;          }
-  AliEMCALSDigitizer        * GetSDigitizer() const { return fSDigitizer  ; }
 
   void Print()const ;
-  
-  //  void SetBranchTitle(const char* branch,const char * title) ;
-  //            // Sets the branch titles to separate different reconstruction flows 
-  //
-  //  void StartFrom(char * module = "SDigitizer",char * title = "Default") ;
-  //            // From wich step reconstruction begins, 
-  //            // title to be set to all reconstructed branches
 
   AliEMCALReconstructioner & operator = (const AliEMCALReconstructioner & /*rvalue*/)  {
     // assignement operator requested by coding convention but not needed
@@ -63,22 +53,17 @@ public:
     return *this ; 
   }
   
-
 private:
   void Init() ;  
 
 private:
   
-  TString  fDigitsBranch ;      // Title of digits branch
   TString  fRecPointBranch ;    // Title of RecPoints branch   
   TString  fRecPartBranch ;     // Title of RecParticles branch 
-  TString  fSDigitsBranch ;     // Title of SDigits branch      
 
 
-  AliEMCALDigitizer         * fDigitizer ;   //! Pointer to AliEMCALDigitizer
   AliEMCALClusterizer       * fClusterizer ; //! Pointer to AliEMCALClusterizer
   AliEMCALPID               * fPID ;         //! Pointer to AliEMCALPID
-  AliEMCALSDigitizer        * fSDigitizer ;  //! Pointer to AliEMCALSDigitizer
 
   Bool_t   fIsInitialized ; // kTRUE if reconstructioner is initialized
  

diff --git a/PHOS/AliPHOSReconstructioner.cxx b/PHOS/AliPHOSReconstructioner.cxx
index add207d148aa3794cac313e42757956c6edf95a2..479bbab950794e6fe457959dc7275376e30fc3cd 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.cxx
+++ b/PHOS/AliPHOSReconstructioner.cxx
@@ -52,29 +52,24 @@
 //
 //             // And finally one can call ExecuteTask() with the following options
 //  root [5] r->ExecuteTask("debug all timing")
-//             // deb     - prints the numbers of produced SDigits, Digits etc.
-//             // deb all - prints in addition list of made SDigits, digits etc.
-//             // timing  - prints benchmarking results
+//            // deb     - prints the numbers of RecPoints, TrackSegments, RecParticles 
+//            // deb all - prints in addition list of RecPoints, TrackSegments, RecParticles  
+//            // timing  - prints benchmarking results
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 // --- ROOT system ---
 
 // --- Standard library ---
-#include "Riostream.h"
 
 // --- AliRoot header files ---
-#include "AliRunLoader.h"
 #include "AliESD.h"
 #include "AliESDCaloTrack.h"
 #include "AliPHOSReconstructioner.h"
 #include "AliPHOSClusterizerv1.h"
-#include "AliPHOSDigitizer.h"
-#include "AliPHOSSDigitizer.h"
 #include "AliPHOSTrackSegmentMakerv1.h"
 #include "AliPHOSPIDv1.h"
 #include "AliPHOSGetter.h"
 
-#include "AliPHOSLoader.h"
 
 ClassImp(AliPHOSReconstructioner)
 
@@ -82,11 +77,9 @@ ClassImp(AliPHOSReconstructioner)
   AliPHOSReconstructioner::AliPHOSReconstructioner():TTask("AliPHOSReconstructioner","")
 {
   // ctor
-  fDigitizer   = 0 ;
   fClusterizer = 0 ;
   fTSMaker     = 0 ;
   fPID         = 0 ; 
-  fSDigitizer  = 0 ;
 
   fIsInitialized = kFALSE ;
 
@@ -97,75 +90,30 @@ AliPHOSReconstructioner::AliPHOSReconstructioner(const char* evFoldName,const ch
 TTask("AliPHOSReconstructioner",evFoldName)
 {
   // ctor
-  AliRunLoader* rl = AliRunLoader::GetRunLoader(evFoldName);
-  if (rl == 0x0)
-   {
-     Fatal("AliPHOSReconstructioner","Can not get Run Loader from folder %s.",evFoldName);
-   } 
-  if (rl->GetAliRun() == 0x0)
-   {
-     delete gAlice;
-     gAlice = 0x0;
-     rl->LoadgAlice();
-     gAlice = rl->GetAliRun();
-   }
 
-  AliPHOSLoader* gime = dynamic_cast<AliPHOSLoader*>(rl->GetLoader("PHOSLoader"));
-  if (gime == 0x0)
-   {
-     Error("AliPHOSReconstructioner","Can not get PHOS Loader");
-     return;  
-   }
-  
-  TString galicefn = rl->GetFileName();
-  TString method("AliPHOSReconstructioner::AliPHOSReconstructioner(");
-  method = (((method + evFoldName)+",")+branchName)+"): ";
-  
-  fSDigitsBranch= branchName; 
-  
-  //P.Skowronski remark
-  // Tasks has default fixed names
-  // other tasks can be added, even runtime
-  // with arbitrary name. See AliDataLoader::
-  cout<<"\n\n\n";
-  cout<<method<<"\n\nCreating SDigitizer\n";
-  fSDigitizer  = new AliPHOSSDigitizer(galicefn,GetTitle());
-  Add(fSDigitizer);
-  gime->PostSDigitizer(fSDigitizer);
-
-  fDigitsBranch=branchName ;
-  cout<<"\n\n\n";
-  cout<<method<<"\n\nCreating Digitizer\n";
-  fDigitizer   = new AliPHOSDigitizer(galicefn,GetTitle()) ;
-  Add(fDigitizer) ;
-  gime->PostDigitizer(fDigitizer);
+  AliPHOSGetter::Instance(evFoldName) ; 
 
   fRecPointBranch=branchName ; 
-  cout<<"\n\n\n";
-  cout<<method<<"Creating Clusterizer\n";
-  fClusterizer = new AliPHOSClusterizerv1(galicefn,GetTitle());
+  Info("ctor", "Creating Clusterizer") ;
+  fClusterizer = new AliPHOSClusterizerv1(evFoldName, GetTitle());
   Add(fClusterizer);
-  gime->PostReconstructioner(fClusterizer);
   
   fTSBranch=branchName ; 
-  fTSMaker     = new AliPHOSTrackSegmentMakerv1(galicefn,GetTitle());
+  Info("ctor", "Creating Track Segment Maker") ;
+  fTSMaker     = new AliPHOSTrackSegmentMakerv1(evFoldName, GetTitle());
   Add(fTSMaker) ;
-  gime->PostTracker(fTSMaker);
-
   
   fRecPartBranch=branchName ; 
-  cout<<"\n\n\n";
-  cout<<method<<"Creating PID\n";
-  fPID         = new AliPHOSPIDv1(galicefn,GetTitle());
+  Info("ctor", "Creating PID") ;
+  fPID         = new AliPHOSPIDv1(evFoldName, GetTitle());
   Add(fPID);
-  cout<<"\nFINISHED \n\n"<<method;
   
   fIsInitialized = kTRUE ;
 } 
 //____________________________________________________________________________
 void AliPHOSReconstructioner::Exec(Option_t *opt)
 {
-  //check, if the names of branches, which should be made conicide with already
+  //check, if the names of branches, which should be made coincide with already
   //existing
   if (!opt) 
     return ; 
@@ -204,16 +152,7 @@ void AliPHOSReconstructioner:: Clusters2Tracks(Int_t ievent, AliESD *event)
   // initiliaze Reconstructioner if necessary: we can not do this in default constructor
 
   if(!fIsInitialized){
-    // Initialisation
-
-    fSDigitsBranch="Default" ; 
-    fSDigitizer  = new AliPHOSSDigitizer(GetTitle(),fSDigitsBranch.Data()) ; 
-    Add(fSDigitizer) ;
-
-    fDigitsBranch="Default" ; 
-    fDigitizer   = new AliPHOSDigitizer(GetTitle(),fDigitsBranch.Data());
-    Add(fDigitizer) ;
-
+    
     fRecPointBranch="Default" ; 
     fClusterizer = new AliPHOSClusterizerv1(GetTitle(),fRecPointBranch.Data());
     Add(fClusterizer) ;
@@ -245,13 +184,6 @@ void AliPHOSReconstructioner::Print()const {
   message += " Reconstruction of the header file %s\n" ;
   message += " with the following modules:\n" ;
 
-  if(fSDigitizer->IsActive()){
-    message += "   (+)   %s to branch %s\n" ; 
-  }
-  if(fDigitizer->IsActive()){
-    message += "   (+)   %s to branch %s\n" ; 
-  }
-  
   if(fClusterizer->IsActive()){
     message += "   (+)   %s to branch %s\n" ;
   }
@@ -265,8 +197,6 @@ void AliPHOSReconstructioner::Print()const {
   }
   Info("Print", message.Data(), 
        GetTitle(), 
-       fSDigitizer->GetName(), fSDigitsBranch.Data(), 
-       fDigitizer->GetName(), fDigitsBranch.Data() , 
        fClusterizer->GetName(), fRecPointBranch.Data(), 
        fTSMaker->GetName(), fTSBranch.Data() , 
        fPID->GetName(), fRecPartBranch.Data() ) ; 

diff --git a/PHOS/AliPHOSReconstructioner.h b/PHOS/AliPHOSReconstructioner.h
index 11b6a7eb323ec3e070f60a1d5f3a9bf07a3aa56e..6923e9cefdfcdd7198d51a8fbde5cb2c34ea2a66 100644 (file)
--- a/PHOS/AliPHOSReconstructioner.h
+++ b/PHOS/AliPHOSReconstructioner.h
@@ -11,8 +11,6 @@
 //*-- Author: Gines Martinez & Yves Schutz (SUBATECH) 
 //*--         Dmitri Peressounko (SUBATECH & Kurchatov Institute)
 
-  //#include <stdlib.h>
-
 // --- ROOT system ---
 
 #include "TTask.h"
@@ -32,7 +30,7 @@ class AliPHOSReconstructioner : public TTask {
 public:
 
   AliPHOSReconstructioner() ; //ctor            
-  AliPHOSReconstructioner(const char * headreFile, const char * branchName = "Default");
+  AliPHOSReconstructioner(const char * headerFile, const char * branchName = "Default");
   AliPHOSReconstructioner(const AliPHOSReconstructioner & rec) : TTask(rec) {
     // cpy ctor: 
     // requested by the Coding Convention
@@ -44,20 +42,11 @@ public:
   virtual void Exec(Option_t *) ;
   void Clusters2Tracks(Int_t ievent, AliESD *event);
 
-  AliPHOSDigitizer         * GetDigitizer()  const { return fDigitizer   ; }
   AliPHOSClusterizer       * GetClusterizer()const { return fClusterizer ; }
   AliPHOSPID               * GetPID()        const { return fPID;          }
   AliPHOSTrackSegmentMaker * GetTSMaker()    const { return fTSMaker ;     }
-  AliPHOSSDigitizer        * GetSDigitizer() const { return fSDigitizer  ; }
 
   void Print()const ;
-  
-  //  void SetBranchTitle(const char* branch,const char * title) ;
-  //            // Sets the branch titles to separate different reconstruction flows 
-  //
-  //  void StartFrom(char * module = "SDigitizer",char * title = "Default") ;
-  //            // From wich step reconstruction begins, 
-  //            // title to be set to all reconstructed branches
 
   AliPHOSReconstructioner & operator = (const AliPHOSReconstructioner & /*rvalue*/)  {
     // assignement operator requested by coding convention but not needed
@@ -71,18 +60,14 @@ private:
 
 private:
   
-  TString  fDigitsBranch ;      // Title of digits branch
   TString  fRecPointBranch ;    // Title of RecPoints branch   
   TString  fTSBranch  ;         // Title of TrackSegments branch
   TString  fRecPartBranch ;     // Title of RecParticles branch 
-  TString  fSDigitsBranch ;     // Title of SDigits branch      
 
 
-  AliPHOSDigitizer         * fDigitizer ;   //! Pointer to AliPHOSDigitizer
   AliPHOSClusterizer       * fClusterizer ; //! Pointer to AliPHOSClusterizer
   AliPHOSPID               * fPID ;         //! Pointer to AliPHOSPID
   AliPHOSTrackSegmentMaker * fTSMaker ;     //! Pointer to AliPHOSTrackSegmentMaker
-  AliPHOSSDigitizer        * fSDigitizer ;  //! Pointer to AliPHOSSDigitizer
 
   Bool_t   fIsInitialized ; // kTRUE if reconstructioner is initialized