Preparing to reconstruct from raw data

diff --git a/EMCAL/AliEMCALReconstructor.cxx b/EMCAL/AliEMCALReconstructor.cxx
index 9821aa9eff46c94f0825127bcc32a15b9e32bbf0..d5caaded9a3e494ecec313060e3ef8a5b08cd1ad 100644 (file)
--- a/EMCAL/AliEMCALReconstructor.cxx
+++ b/EMCAL/AliEMCALReconstructor.cxx
@@ -31,6 +31,7 @@
 #include "AliEMCALClusterizerv1.h"
 #include "AliEMCALPIDv1.h"
 #include "AliEMCALGetter.h"
+#include "AliRawReaderFile.h"
 
 ClassImp(AliEMCALReconstructor)
 
@@ -68,6 +69,28 @@ void AliEMCALReconstructor::Reconstruct(AliRunLoader* runLoader) const
 
 }
 
+//____________________________________________________________________________
+void AliEMCALReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReaderFile* rawreader) const 
+{
+  // method called by AliReconstruction; 
+  // Only the clusterization is performed,; the rest of the reconstruction is done in FillESD because the track
+  // segment maker needs access to the AliESD object to retrieve the tracks reconstructed by 
+  // the global tracking.
+  // Here we reconstruct from Raw Data
+  
+  rawreader->Reset() ; 
+  TString headerFile(runLoader->GetFileName()) ; 
+  TString branchName(runLoader->GetEventFolder()->GetName()) ;  
+  
+  AliEMCALClusterizerv1 clu(headerFile, branchName);
+  clu.SetEventRange(0, -1) ; // do all the events
+  if ( Debug() ) 
+    clu.ExecuteTask("deb all") ; 
+  else 
+    clu.ExecuteTask("") ;  
+
+}
+
 //____________________________________________________________________________
 void AliEMCALReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
 {

diff --git a/EMCAL/AliEMCALReconstructor.h b/EMCAL/AliEMCALReconstructor.h
index 032f1cc59261453bdfd2757e5e50c3aca8b60d03..fad05183984438032c3ea80431724e154cfccc7b 100644 (file)
--- a/EMCAL/AliEMCALReconstructor.h
+++ b/EMCAL/AliEMCALReconstructor.h
@@ -20,6 +20,7 @@ class AliEMCALClusterizer ;
 class AliEMCALPID ;
 class AliEMCALSDigitizer ;
 class AliESD ;
+class AliRawReaderFile ; 
 
 // --- Standard library ---
 
@@ -41,7 +42,8 @@ public:
   Bool_t                     Debug() const { return fDebug ; }
   virtual void               FillESD(AliRunLoader* runLoader, AliESD* esd) const ;
   virtual void               Reconstruct(AliRunLoader* runLoader) const ;
-
+  virtual void               Reconstruct(AliRunLoader* runLoader, AliRawReaderFile * rawreader) const ;
+  
   
   AliEMCALReconstructor & operator = (const AliEMCALReconstructor & /*rvalue*/)  {
     // assignement operator requested by coding convention but not needed

diff --git a/PHOS/AliPHOSReconstructor.cxx b/PHOS/AliPHOSReconstructor.cxx
index 92c4af32567b14da40ccf0ebc3cc57ba2ab7135e..69c4d623b8a3db039341107f8af8754e8ef715d1 100644 (file)
--- a/PHOS/AliPHOSReconstructor.cxx
+++ b/PHOS/AliPHOSReconstructor.cxx
@@ -32,6 +32,7 @@
 #include "AliPHOSTrackSegmentMakerv1.h"
 #include "AliPHOSPIDv1.h"
 #include "AliPHOSGetter.h"
+#include "AliRawReaderFile.h"
 
  
 ClassImp(AliPHOSReconstructor)
@@ -72,6 +73,28 @@ void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader) const
 
 }
 
+//____________________________________________________________________________
+void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReaderFile* rawreader) const 
+{
+  // method called by AliReconstruction; 
+  // Only the clusterization is performed,; the rest of the reconstruction is done in FillESD because the track
+  // segment maker needs access to the AliESD object to retrieve the tracks reconstructed by 
+  // the global tracking.
+  // Here we reconstruct from Raw Data
+  
+  rawreader->Reset() ; 
+  TString headerFile(runLoader->GetFileName()) ; 
+  TString branchName(runLoader->GetEventFolder()->GetName()) ;  
+  
+  AliPHOSClusterizerv1 clu(headerFile, branchName);
+  clu.SetEventRange(0, -1) ; // do all the events
+  if ( Debug() ) 
+    clu.ExecuteTask("deb all") ; 
+  else 
+    clu.ExecuteTask("") ;  
+
+}
+
 //____________________________________________________________________________
 void AliPHOSReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
 {

diff --git a/PHOS/AliPHOSReconstructor.h b/PHOS/AliPHOSReconstructor.h
index 35562fd023b6926d15cec4b5b925bcfab6dbfee0..5026de02b4df2fa063ab59d68c5afa920c4c086d 100644 (file)
--- a/PHOS/AliPHOSReconstructor.h
+++ b/PHOS/AliPHOSReconstructor.h
@@ -22,6 +22,7 @@ class AliPHOSTrackSegmentMaker ;
 class AliPHOSPID ;
 class AliPHOSSDigitizer ;
 class AliESD ;
+class AliRawReaderFile ; 
 
 // --- Standard library ---
 
@@ -43,6 +44,7 @@ public:
   static Bool_t              Debug() { return fgDebug ; }
   virtual void               FillESD(AliRunLoader* runLoader, AliESD* esd) const ;
   virtual void               Reconstruct(AliRunLoader* runLoader) const ;
+  virtual void               Reconstruct(AliRunLoader* runLoader, AliRawReaderFile * rawreader) const ;
 
   AliPHOSReconstructor & operator = (const AliPHOSReconstructor & /*rvalue*/)  {
     // assignement operator requested by coding convention but not needed