// 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.;
// 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.;
// Author: Davide Perrino <davide.perrino@cern.ch>
//
// **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
//-------------------------------------------------------------------------
#include "AliAODEvent.h"
#include "AliAODTrack.h"
#include "AliAODMCParticle.h"
-#include "AliEMCALGeoUtils.h"
+#include "AliEMCALGeometry.h"
#include "AliJetAODFillUnitArrayTracks.h"
#include "AliJetAODFillUnitArrayEMCalDigits.h"
#include "AliJetHadronCorrectionv1.h"
#include "AliJetUnitArray.h"
#include "AliJetGrid.h"
class AliJetUnitArray;
-class AliEMCALGeoUtils;
+class AliEMCALGeometry;
class AliJetHadronCorrection;
class AliJetAODReaderHeader;
class AliJetReaderHeader;
// 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();
// Magali Estienne <magali.estienne@subatech.in2p3.fr>
//
// **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
//-------------------------------------------------------------------------
#include "AliVEvent.h"
#include "AliESD.h"
#include "AliESDtrack.h"
-#include "AliEMCALGeoUtils.h"
+#include "AliEMCALGeometry.h"
#include "AliEMCALEMCGeometry.h"
#include "AliJetESDFillUnitArrayTracks.h"
#include "AliJetESDFillUnitArrayEMCalDigits.h"
class TRefArray;
class AliJetESDReaderHeader;
class AliEMCALGeometry;
-class AliEMCALGeoUtils;
+class AliEMCALGeometry;
class AliJetHadronCorrection;
class AliJetUnitArray;
class AliJetReaderHeader;
#include "AliJetReaderHeader.h"
#include "AliJetAODReaderHeader.h"
-#include "AliEMCALGeoUtils.h"
+#include "AliEMCALGeometry.h"
#include "AliJetGrid.h"
#include "AliESDEvent.h"
#include "AliAODEvent.h"
class Riostream;
-class AliEMCALGeoUtils;
+class AliEMCALGeometry;
class AliJetReader;
class AliJetESDReader;
// 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;}
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
// 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
#include "AliJetReaderHeader.h"
#include "AliESDEvent.h"
#include "AliHeader.h"
-#include "AliEMCALGeoUtils.h"
+#include "AliEMCALGeometry.h"
#include "AliEMCALEMCGeometry.h"
#include "AliJetESDFillUnitArrayTracks.h"
#include "AliJetESDFillUnitArrayEMCalDigits.h"
ClassImp(AliJetReader)
////////////////////////////////////////////////////////////////////////
-AliEMCALGeoUtils *AliJetReader::fGeom=0;
+AliEMCALGeometry *AliJetReader::fGeom=0;
AliJetReader::AliJetReader():
// Constructor
// Define EMCAL geometry
if(fDebug>10) cout<<"which EMCALgeometry is going to be uploaded?"<<geoType<<endl;
- fGeom = new AliEMCALGeoUtils(geoType,"EMCAL");
+ fGeom = AliEMCALGeometry::GetInstance(geoType);
for (Int_t mod=0;mod<(fGeom->GetEMCGeometry())->GetNumberOfSuperModules();mod+=1)
class TTask;
class TClonesArray;
class TRefArray;
-class AliEMCALGeoUtils;
+class AliEMCALGeometry;
class AliJetReaderHeader;
class AliESDEvent;
class AliHeader;
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