Calibration parameters for ideal calibration, decalibration and inverse calibration...

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

diff --git a/PHOS/AliPHOSReconstructor.cxx b/PHOS/AliPHOSReconstructor.cxx
index 2650fe3585f0401dd661d99aa87118340fcddb2f..726aa99000cc66b1b2c26aa6d19264742f2a3a29 100644 (file)
--- a/PHOS/AliPHOSReconstructor.cxx
+++ b/PHOS/AliPHOSReconstructor.cxx
@@ -33,7 +33,7 @@
 #include "AliPHOSPIDv1.h"
 #include "AliPHOSGetter.h"
 #include "AliPHOSTracker.h"
-#include "AliRawReaderFile.h"
+#include "AliRawReader.h"
 
  
 ClassImp(AliPHOSReconstructor)
@@ -55,7 +55,7 @@ Bool_t AliPHOSReconstructor::fgDebug = kFALSE ;
 } 
 
 //____________________________________________________________________________
-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
@@ -75,24 +75,25 @@ void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader) const
 }
 
 //____________________________________________________________________________
-void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* rawreader) const 
+void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* 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
+  clu.SetRawReader(rawreader);
   if ( Debug() ) 
     clu.ExecuteTask("deb all") ; 
   else 
-    clu.ExecuteTask("") ;  
+    clu.ExecuteTask("") ;
 
 }
 
@@ -108,25 +109,26 @@ void AliPHOSReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
   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->GetNumberOfCaloClusters()) ; 
 
   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()) ;
-    et->SetLabel       (rp->GetPrimaryIndex());
+    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;
   }
 }