From f445ed00cfd6ea9deb36e5953220c4464af08759 Mon Sep 17 00:00:00 2001 From: kleinb Date: Sun, 26 Jun 2011 11:01:50 +0000 Subject: [PATCH] Change in JETAN from AliEMCALGeoUtils to AliEMCALGeometry (M. Bregant) --- JETAN/AliJetAODFillUnitArrayTracks.cxx | 4 ++-- JETAN/AliJetAODReader.cxx | 4 ++-- JETAN/AliJetAODReader.h | 2 +- JETAN/AliJetESDFillUnitArrayTracks.cxx | 2 +- JETAN/AliJetESDReader.cxx | 4 ++-- JETAN/AliJetESDReader.h | 2 +- JETAN/AliJetFillUnitArray.h | 8 ++++---- JETAN/AliJetReader.cxx | 8 ++++---- JETAN/AliJetReader.h | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/JETAN/AliJetAODFillUnitArrayTracks.cxx b/JETAN/AliJetAODFillUnitArrayTracks.cxx index 49feeae074b..91fe93a6a2b 100644 --- a/JETAN/AliJetAODFillUnitArrayTracks.cxx +++ b/JETAN/AliJetAODFillUnitArrayTracks.cxx @@ -518,7 +518,7 @@ void AliJetAODFillUnitArrayTracks::Exec(Option_t* const /*option*/) // End of if(fGrid==1) -> hadron correction for all tracks if (fApplyMIPCorrection != 0 && p3.Mag() >= 0.5) { - ((AliJetHadronCorrectionv1*)fHadCorr)->SetGeometry("EMCAL_COMPLETE",1.); + ((AliJetHadronCorrectionv1*)fHadCorr)->SetGeometry("EMCAL_COMPLETEV1",1.); Double_t etaOut = 0.; Double_t phiOut = 0.; @@ -617,7 +617,7 @@ void AliJetAODFillUnitArrayTracks::Exec(Option_t* const /*option*/) // For the moment I apply MIP correction if p >= 0.5 GeV/c if (fApplyMIPCorrection != 0 && p3.Mag() >= 0.5) { - ((AliJetHadronCorrectionv1*)fHadCorr)->SetGeometry("EMCAL_COMPLETE",1.); + ((AliJetHadronCorrectionv1*)fHadCorr)->SetGeometry("EMCAL_COMPLETEV1",1.); Double_t etaOut = 0.; Double_t phiOut = 0.; diff --git a/JETAN/AliJetAODReader.cxx b/JETAN/AliJetAODReader.cxx index 1de092d38f7..6b6be2dc852 100644 --- a/JETAN/AliJetAODReader.cxx +++ b/JETAN/AliJetAODReader.cxx @@ -22,7 +22,7 @@ // Author: Davide Perrino // // **February 2011 -// implemented standard geometry (AliEMCALGeoUtils) instead of dummy one (AliJetDummyGeo) +// implemented standard geometry (AliEMCALGeometry) instead of dummy one (AliJetDummyGeo) // moved geometry definition in AliJetReader // marco.bregant@subatech.in2p3.fr //------------------------------------------------------------------------- @@ -43,7 +43,7 @@ #include "AliAODEvent.h" #include "AliAODTrack.h" #include "AliAODMCParticle.h" -#include "AliEMCALGeoUtils.h" +#include "AliEMCALGeometry.h" #include "AliJetAODFillUnitArrayTracks.h" #include "AliJetAODFillUnitArrayEMCalDigits.h" #include "AliJetHadronCorrectionv1.h" diff --git a/JETAN/AliJetAODReader.h b/JETAN/AliJetAODReader.h index d3e87e5bed0..258cdc4d1c9 100644 --- a/JETAN/AliJetAODReader.h +++ b/JETAN/AliJetAODReader.h @@ -14,7 +14,7 @@ #include "AliJetUnitArray.h" #include "AliJetGrid.h" class AliJetUnitArray; -class AliEMCALGeoUtils; +class AliEMCALGeometry; class AliJetHadronCorrection; class AliJetAODReaderHeader; class AliJetReaderHeader; diff --git a/JETAN/AliJetESDFillUnitArrayTracks.cxx b/JETAN/AliJetESDFillUnitArrayTracks.cxx index 96ddbafe20a..87eef9860ef 100644 --- a/JETAN/AliJetESDFillUnitArrayTracks.cxx +++ b/JETAN/AliJetESDFillUnitArrayTracks.cxx @@ -533,7 +533,7 @@ void AliJetESDFillUnitArrayTracks::Exec(Option_t* const /*option*/) // For the moment I apply MIP correction if p >= 0.5 GeV/c if (fApplyMIPCorrection != 0 && p3.Mag() >= 0.5) { - ((AliJetHadronCorrectionv1*)fHadCorr)->SetGeometry("EMCAL_COMPLETE",1.); + ((AliJetHadronCorrectionv1*)fHadCorr)->SetGeometry("EMCAL_COMPLETEV1",1.); // Get track position at the outer part of the reconstruction ~ TRD Double_t phiOut = track->GetOuterParam()->Phi(); diff --git a/JETAN/AliJetESDReader.cxx b/JETAN/AliJetESDReader.cxx index ffebed0149e..6012bf263e3 100755 --- a/JETAN/AliJetESDReader.cxx +++ b/JETAN/AliJetESDReader.cxx @@ -20,7 +20,7 @@ // Magali Estienne // // **February 2011 -// implemented standard geometry (AliEMCALGeoUtils) instead of dummy one (AliJetDummyGeo) +// implemented standard geometry (AliEMCALGeometry) instead of dummy one (AliJetDummyGeo) // moved geometry definition in AliJetReader // marco.bregant@subatech.in2p3.fr //------------------------------------------------------------------------- @@ -51,7 +51,7 @@ #include "AliVEvent.h" #include "AliESD.h" #include "AliESDtrack.h" -#include "AliEMCALGeoUtils.h" +#include "AliEMCALGeometry.h" #include "AliEMCALEMCGeometry.h" #include "AliJetESDFillUnitArrayTracks.h" #include "AliJetESDFillUnitArrayEMCalDigits.h" diff --git a/JETAN/AliJetESDReader.h b/JETAN/AliJetESDReader.h index b42db071f38..2755fc8e7fc 100755 --- a/JETAN/AliJetESDReader.h +++ b/JETAN/AliJetESDReader.h @@ -21,7 +21,7 @@ class TRefArray; class AliJetESDReaderHeader; class AliEMCALGeometry; -class AliEMCALGeoUtils; +class AliEMCALGeometry; class AliJetHadronCorrection; class AliJetUnitArray; class AliJetReaderHeader; diff --git a/JETAN/AliJetFillUnitArray.h b/JETAN/AliJetFillUnitArray.h index 539a2cf2653..a47570a8a4e 100644 --- a/JETAN/AliJetFillUnitArray.h +++ b/JETAN/AliJetFillUnitArray.h @@ -21,7 +21,7 @@ #include "AliJetReaderHeader.h" #include "AliJetAODReaderHeader.h" -#include "AliEMCALGeoUtils.h" +#include "AliEMCALGeometry.h" #include "AliJetGrid.h" #include "AliESDEvent.h" #include "AliAODEvent.h" @@ -29,7 +29,7 @@ class Riostream; -class AliEMCALGeoUtils; +class AliEMCALGeometry; class AliJetReader; class AliJetESDReader; @@ -43,7 +43,7 @@ class AliJetFillUnitArray : public TTask // Setter virtual void SetReaderHeader(AliJetReaderHeader* const readerHeader) {fReaderHeader = readerHeader;} - virtual void SetGeom(AliEMCALGeoUtils* const geom) {fGeom = geom;} + virtual void SetGeom(AliEMCALGeometry* const geom) {fGeom = geom;} virtual void SetMomentumArray(TClonesArray* const momentumArray) {fMomentumArray = momentumArray;} virtual void SetUnitArray(TClonesArray* const unitArray) {fUnitArray = unitArray;} virtual void SetRefArray(TRefArray* const refArray) {fRefArray = refArray;} @@ -104,7 +104,7 @@ class AliJetFillUnitArray : public TTask Bool_t fProcId; // Bool_t for TProcessID synchronization AliJetGrid *fTPCGrid; // Define filled grid AliJetGrid *fEMCalGrid; // Define filled grid - AliEMCALGeoUtils *fGeom; // Define EMCal geometry + AliEMCALGeometry *fGeom; // Define EMCal geometry Int_t fNphi; // number of points in the grid: phi Int_t fNeta; // " eta diff --git a/JETAN/AliJetReader.cxx b/JETAN/AliJetReader.cxx index a6ae71d42ce..a74a5e8b7e4 100755 --- a/JETAN/AliJetReader.cxx +++ b/JETAN/AliJetReader.cxx @@ -20,7 +20,7 @@ // magali.estienne@IReS.in2p3.fr // // **February 2011 -// implemented standard geometry (AliEMCALGeoUtils) (was AliJetDummyGeo implented separately in ESDReader and AODReader +// implemented standard geometry (AliEMCALGeometry) (was AliJetDummyGeo implented separately in ESDReader and AODReader // local2master matrices are now get from $ALICE_ROOT/OADB/PWG4/JetReconstruction/EMCALlocal2master.root // you can choose the geometry (EMCAL_COMPLETE, EMCAL_FIRSTYEARv1, etc) via SetEMCALgeo2bLoad('Name_of_Geometry') in the Readerheader // different options for survey(ed) matrice are provided too @@ -40,7 +40,7 @@ #include "AliJetReaderHeader.h" #include "AliESDEvent.h" #include "AliHeader.h" -#include "AliEMCALGeoUtils.h" +#include "AliEMCALGeometry.h" #include "AliEMCALEMCGeometry.h" #include "AliJetESDFillUnitArrayTracks.h" #include "AliJetESDFillUnitArrayEMCalDigits.h" @@ -51,7 +51,7 @@ ClassImp(AliJetReader) //////////////////////////////////////////////////////////////////////// -AliEMCALGeoUtils *AliJetReader::fGeom=0; +AliEMCALGeometry *AliJetReader::fGeom=0; AliJetReader::AliJetReader(): // Constructor @@ -195,7 +195,7 @@ if(myPath.Length()) { // Define EMCAL geometry if(fDebug>10) cout<<"which EMCALgeometry is going to be uploaded?"<GetEMCGeometry())->GetNumberOfSuperModules();mod+=1) diff --git a/JETAN/AliJetReader.h b/JETAN/AliJetReader.h index 26cae2cfa7f..32714271239 100755 --- a/JETAN/AliJetReader.h +++ b/JETAN/AliJetReader.h @@ -18,7 +18,7 @@ class TChain; class TTask; class TClonesArray; class TRefArray; -class AliEMCALGeoUtils; +class AliEMCALGeometry; class AliJetReaderHeader; class AliESDEvent; class AliHeader; @@ -84,7 +84,7 @@ class AliJetReader : public TObject TString fJetanOADBpath; //! path to official OADB, to be set by the task - static AliEMCALGeoUtils *fGeom; //! EMCAL Geometry + static AliEMCALGeometry *fGeom; //! EMCAL Geometry TChain *fChain; // chain for reconstructed tracks TChain *fTree; // tree for reconstructed tracks TClonesArray *fMomentumArray; // array of particle momenta -- 2.43.0