From: schutz Date: Mon, 28 Jan 2002 08:07:36 +0000 (+0000) Subject: Changed Clusterizer() to return a Clusterizerv1* instead of a Clusterizer X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=ea4de7a21248b8cecb1c467a5b93683b25fa41fe Changed Clusterizer() to return a Clusterizerv1* instead of a Clusterizer --- diff --git a/EMCAL/AliEMCALGetter.cxx b/EMCAL/AliEMCALGetter.cxx index 57c19bc6cfd..82f9874a68f 100644 --- a/EMCAL/AliEMCALGetter.cxx +++ b/EMCAL/AliEMCALGetter.cxx @@ -650,7 +650,7 @@ TObject ** AliEMCALGetter::PreShoRecPointsRef(const char * name) const } //____________________________________________________________________________ -Bool_t AliEMCALGetter::PostClusterizer(AliEMCALClusterizer * clu) const +Bool_t AliEMCALGetter::PostClusterizer(AliEMCALClusterizerv1 * clu) const { // ------------------ AliEMCALClusterizer ------------------------ // the hierarchy is //Folders/Tasks/Reconstructioner/EMCAL/sdigitsname @@ -672,7 +672,7 @@ Bool_t AliEMCALGetter::PostClusterizer(AliEMCALClusterizer * clu) const tasks->Add(emcal) ; } - AliEMCALClusterizer * emcalcl = dynamic_cast(emcal->GetListOfTasks()->FindObject(clu->GetName())) ; + AliEMCALClusterizerv1 * emcalcl = dynamic_cast(emcal->GetListOfTasks()->FindObject(clu->GetName())) ; if (emcalcl) { if (fDebug) cout << "INFO: AliEMCALGetter::Post Rer -> Task " << clu->GetName() << " already exists" << endl ; @@ -743,7 +743,7 @@ Bool_t AliEMCALGetter::PostClusterizer(const char * name) const tasks->Add(emcal) ; } - AliEMCALClusterizer * emcalcl = new AliEMCALClusterizerv1() ; + AliEMCALClusterizerv1 * emcalcl = new AliEMCALClusterizerv1() ; TString clun(name) ; clun+=":clu-v1" ; emcalcl->SetName(clun) ; diff --git a/EMCAL/AliEMCALGetter.h b/EMCAL/AliEMCALGetter.h index c9ffcb80a33..27a82fac999 100644 --- a/EMCAL/AliEMCALGetter.h +++ b/EMCAL/AliEMCALGetter.h @@ -38,7 +38,7 @@ class TTask ; #include "AliEMCALSDigitizer.h" #include "AliEMCALTowerRecPoint.h" class AliEMCALGeometry ; -class AliEMCALClusterizer ; +class AliEMCALClusterizerv1 ; //class AliEMCALTrackSegment ; //class AliEMCALTrackSegmentMaker ; //class AliEMCALRecParticle ; @@ -69,7 +69,7 @@ class AliEMCALGetter : public TObject { //Bool_t PostRecParticles( const char * name) const ; Bool_t PostClusterizer( const char * name) const ; - Bool_t PostClusterizer(AliEMCALClusterizer * clu) const ; + Bool_t PostClusterizer(AliEMCALClusterizerv1 * clu) const ; Bool_t PostSDigitizer (AliEMCALSDigitizer * sdigitizer) const ; Bool_t PostSDigitizer ( const char * name, const char * file ) const ; Bool_t PostDigitizer (AliEMCALDigitizer * digitizer) const ; @@ -139,8 +139,8 @@ class AliEMCALGetter : public TObject { const AliEMCALTowerRecPoint * PreShowerRecPoint(Int_t index) { return static_cast(PreShowerRecPoints()->At(index)) ;} - AliEMCALClusterizer * Clusterizer (const char * name =0) const { - return (AliEMCALClusterizer*)(ReturnT("Clusterizer", name)) ; } + AliEMCALClusterizerv1 * Clusterizer (const char * name =0) const { + return (AliEMCALClusterizerv1*)(ReturnT("Clusterizer", name)) ; } // TrackSegments //TClonesArray * TrackSegments(const char * name = 0) const