From 0379a13ea34bf865da3eb9a6e03db3840f0539a7 Mon Sep 17 00:00:00 2001 From: schutz Date: Fri, 23 Apr 2004 16:53:50 +0000 Subject: [PATCH] Renove the clusterizer after Reconstruct. Use as much the runloader instead of the getter whenever I understand it is better to use it. --- PHOS/AliPHOSReconstructor.cxx | 34 ++++++++++++++++++++++------------ PHOS/AliPHOSReconstructor.h | 3 +-- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/PHOS/AliPHOSReconstructor.cxx b/PHOS/AliPHOSReconstructor.cxx index 8bac1b5b03a..15afcc1748c 100644 --- a/PHOS/AliPHOSReconstructor.cxx +++ b/PHOS/AliPHOSReconstructor.cxx @@ -40,8 +40,15 @@ ClassImp(AliPHOSReconstructor) AliPHOSReconstructor::AliPHOSReconstructor() : fDebug(kFALSE) { // ctor + } +//____________________________________________________________________________ + AliPHOSReconstructor::~AliPHOSReconstructor() +{ + // dtor + +} //____________________________________________________________________________ void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader) const @@ -60,6 +67,8 @@ void AliPHOSReconstructor::Reconstruct(AliRunLoader* runLoader) const clu.ExecuteTask("deb all") ; else clu.ExecuteTask("") ; + + AliPHOSGetter::Instance()->PhosLoader()->CleanReconstructioner(); } //____________________________________________________________________________ @@ -71,26 +80,27 @@ void AliPHOSReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const TString headerFile(runLoader->GetFileName()) ; TString branchName("Default") ; - AliPHOSTrackSegmentMakerv1 tsMaker(headerFile, branchName); - AliPHOSPIDv1 pID(headerFile, branchName); + AliPHOSTrackSegmentMakerv1 tsm(headerFile, branchName); + AliPHOSPIDv1 pid(headerFile, branchName); - AliPHOSGetter *gime = AliPHOSGetter::Instance( (runLoader->GetFileName()).Data() ) ; - Int_t eventNumber = gime->EventNumber(); + // AliPHOSGetter *gime = AliPHOSGetter::Instance() ; + Int_t eventNumber = runLoader->GetEventNumber() ; // do current event; the loop over events is done by AliReconstruction::Run() - tsMaker.SetEventRange(eventNumber, eventNumber) ; - pID.SetEventRange(eventNumber, eventNumber) ; + Info("FillESD 1", "%d", eventNumber) ; + tsm.SetEventRange(eventNumber, eventNumber) ; + pid.SetEventRange(eventNumber, eventNumber) ; if ( Debug() ) { - tsMaker.ExecuteTask("deb all") ; - pID.ExecuteTask("deb all") ; + tsm.ExecuteTask("deb all") ; + pid.ExecuteTask("deb all") ; } else { - tsMaker.ExecuteTask("") ; - pID.ExecuteTask("") ; + tsm.ExecuteTask("") ; + pid.ExecuteTask("") ; } // Creates AliESDtrack from AliPHOSRecParticles - gime->Event(eventNumber, "P") ; - TClonesArray *recParticles = gime->RecParticles(); + AliPHOSGetter::Instance()->Event(eventNumber, "P") ; + TClonesArray *recParticles = AliPHOSGetter::Instance()->RecParticles(); Int_t nOfRecParticles = recParticles->GetEntries(); for (Int_t recpart = 0 ; recpart < nOfRecParticles ; recpart++) { AliPHOSRecParticle * rp = dynamic_cast(recParticles->At(recpart)); diff --git a/PHOS/AliPHOSReconstructor.h b/PHOS/AliPHOSReconstructor.h index f5b195ba1ed..7e4296e7e61 100644 --- a/PHOS/AliPHOSReconstructor.h +++ b/PHOS/AliPHOSReconstructor.h @@ -37,8 +37,7 @@ public: // requested by the Coding Convention Fatal("cpy ctor", "not implemented") ; } - - virtual ~AliPHOSReconstructor() {} ; + ~AliPHOSReconstructor() ; //dtor Bool_t Debug() const { return fDebug ; } virtual void FillESD(AliRunLoader* runLoader, AliESD* esd) const ; -- 2.39.3