Fixed compilation warnings with gcc-4.

[u/mrichter/AliRoot.git] / PHOS / AliPHOSReconstructor.cxx

diff --git a/PHOS/AliPHOSReconstructor.cxx b/PHOS/AliPHOSReconstructor.cxx
index 9d6744b45ee0a8982b2fbcd17d5822d2e89bc067..4b0d64a547e9b70b65b899f60c6bd2e2427b2ff8 100644 (file)
--- a/PHOS/AliPHOSReconstructor.cxx
+++ b/PHOS/AliPHOSReconstructor.cxx
@@ -32,12 +32,16 @@
 #include "AliPHOSTrackSegmentMakerv1.h"
 #include "AliPHOSPIDv1.h"
 #include "AliPHOSGetter.h"
+#include "AliPHOSTracker.h"
+#include "AliRawReader.h"
 
-
+ 
 ClassImp(AliPHOSReconstructor)
 
+Bool_t AliPHOSReconstructor::fgDebug = kFALSE ; 
+
 //____________________________________________________________________________
-  AliPHOSReconstructor::AliPHOSReconstructor() : fDebug(kFALSE) 
+  AliPHOSReconstructor::AliPHOSReconstructor() 
 {
   // ctor
 
@@ -51,7 +55,7 @@ ClassImp(AliPHOSReconstructor)
 } 
 
 //____________________________________________________________________________
-void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader) const 
+void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader) const
 {
   // method called by AliReconstruction; 
   // Only the clusterization is performed,; the rest of the reconstruction is done in FillESD because the track
@@ -59,7 +63,7 @@ void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader) const
   // the global tracking.
  
   TString headerFile(runLoader->GetFileName()) ; 
-  TString branchName("Default") ;  
+  TString branchName(runLoader->GetEventFolder()->GetName()) ;  
   
   AliPHOSClusterizerv1 clu(headerFile, branchName);
   clu.SetEventRange(0, -1) ; // do all the events
@@ -68,57 +72,70 @@ void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader) const
   else 
     clu.ExecuteTask("") ;  
 
-  AliPHOSGetter::Instance()->PhosLoader()->CleanReconstructioner();
 }
 
 //____________________________________________________________________________
-void AliPHOSReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
+void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* rawreader) const
 {
-  // Called by AliReconstruct after Reconstruct() and global tracking and vertxing 
-  //Creates the tracksegments and Recparticles
-  
+  // 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("Default") ;  
+  TString branchName(runLoader->GetEventFolder()->GetName()) ;  
+  
+  AliPHOSClusterizerv1 clu(headerFile, branchName);
+  clu.SetEventRange(0, -1) ; // do all the events
+  clu.SetRawReader(rawreader);
+  if ( Debug() ) 
+    clu.ExecuteTask("deb all") ; 
+  else 
+    clu.ExecuteTask("") ;
 
-  AliPHOSTrackSegmentMakerv1 tsm(headerFile, branchName);
-  tsm.SetESD(esd) ; 
-  AliPHOSPIDv1 pid(headerFile, branchName);
+}
+
+//____________________________________________________________________________
+void AliPHOSReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
+{
+  // This function creates AliESDtracks from AliPHOSRecParticles
+  //         and
+  // writes them to the ESD
 
-  //  AliPHOSGetter *gime = AliPHOSGetter::Instance() ;
   Int_t eventNumber = runLoader->GetEventNumber() ;
-  // do current event; the loop over events is done by AliReconstruction::Run()
-  tsm.SetEventRange(eventNumber, eventNumber) ; 
-  pid.SetEventRange(eventNumber, eventNumber) ; 
-  if ( Debug() ) {
-   tsm.ExecuteTask("deb all") ;
-   pid.ExecuteTask("deb all") ;
-  }
-  else {
-    tsm.ExecuteTask("") ;
-    pid.ExecuteTask("") ;
-  }
-  
-  // Creates AliESDtrack from AliPHOSRecParticles 
+
   AliPHOSGetter::Instance()->Event(eventNumber, "P") ; 
   TClonesArray *recParticles = AliPHOSGetter::Instance()->RecParticles();
   Int_t nOfRecParticles = recParticles->GetEntries();
-  esd->SetNumberOfPHOSParticles(nOfRecParticles) ; 
-  esd->SetFirstPHOSParticle(esd->GetNumberOfTracks()) ; 
+  esd->SetNumberOfPHOSClusters(nOfRecParticles) ; 
+  esd->SetFirstPHOSCluster(esd->GetNumberOfTracks()) ; 
 
   for (Int_t recpart = 0 ; recpart < nOfRecParticles ; recpart++) {
     AliPHOSRecParticle * rp = dynamic_cast<AliPHOSRecParticle*>(recParticles->At(recpart));
     if (Debug()) 
       rp->Print();
-    AliESDtrack * et = new AliESDtrack() ; 
-    // fills the ESDtrack
-    Double_t xyz[3];
+    AliESDCaloCluster * ec = new AliESDCaloCluster() ; 
+//     AliESDtrack * et = new AliESDtrack() ; 
+    // fills the ESDCaloCluster
+    Float_t xyz[3];
     for (Int_t ixyz=0; ixyz<3; ixyz++) 
       xyz[ixyz] = rp->GetPos()[ixyz];
-    et->SetPHOSposition(xyz) ; 
-    et->SetPHOSsignal  (rp->Energy()) ; 
-    et->SetPHOSpid     (rp->GetPID()) ;
+    ec->SetGlobalPosition(xyz);
+    ec->SetClusterEnergy(rp->Energy());
+    ec->SetPid          (rp->GetPID()) ;
+//     ec->SetPrimaryIndex (rp->GetPrimaryIndex()); // for dry events only
     // add the track to the esd object
-    esd->AddTrack(et);
-    delete et;
+    esd->AddCaloCluster(ec);
+    delete ec;
   }
 }
+
+AliTracker* AliPHOSReconstructor::CreateTracker(AliRunLoader* runLoader) const
+{
+// creates the PHOS tracker
+  if (!runLoader) return NULL; 
+  return new AliPHOSTracker(runLoader);
+}
+