From b6dd6ad21bcfc91a1d290ca7553cd469fd6a8156 Mon Sep 17 00:00:00 2001 From: morsch Date: Mon, 3 Jan 2011 16:37:51 +0000 Subject: [PATCH] AliESDCentrality replaced by AliCentrality --- .../AliAnalysisTaskPHOSPi0CalibSelection.cxx | 12 +++++++++--- PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx | 4 ++-- PWG4/JetTasks/AliAnalysisTaskJetServices.cxx | 2 +- PWG4/PartCorrBase/AliAnaPartCorrBaseClass.h | 4 ++-- PWG4/PartCorrBase/AliCaloTrackAODReader.h | 2 +- PWG4/PartCorrBase/AliCaloTrackESDReader.h | 4 ++-- PWG4/PartCorrBase/AliCaloTrackMCReader.h | 2 +- PWG4/PartCorrBase/AliCaloTrackReader.h | 4 ++-- PWG4/totEt/AliAnalysisEt.h | 6 +++--- PWG4/totEt/AliAnalysisTaskHadEt.cxx | 2 +- PWG4/totEt/AliAnalysisTaskTotEt.cxx | 2 +- PWG4/totEt/AliAnalysisTaskTransverseEnergy.cxx | 4 ++-- PWG4/totEt/AliAnalysisTaskTransverseEnergy.h | 4 ++-- 13 files changed, 29 insertions(+), 23 deletions(-) diff --git a/PWG4/CaloCalib/AliAnalysisTaskPHOSPi0CalibSelection.cxx b/PWG4/CaloCalib/AliAnalysisTaskPHOSPi0CalibSelection.cxx index e7c6e55c166..4e644a1fb79 100644 --- a/PWG4/CaloCalib/AliAnalysisTaskPHOSPi0CalibSelection.cxx +++ b/PWG4/CaloCalib/AliAnalysisTaskPHOSPi0CalibSelection.cxx @@ -38,6 +38,7 @@ #include "AliESDCaloCells.h" #include "AliPHOSAodCluster.h" #include "AliPHOSPIDv1.h" +#include "AliCentrality.h" ClassImp(AliAnalysisTaskPHOSPi0CalibSelection) @@ -121,8 +122,13 @@ void AliAnalysisTaskPHOSPi0CalibSelection::CreateAODFromAOD() header->SetPeriodNumber(headerin->GetPeriodNumber()); header->SetEventType(headerin->GetEventType()); header->SetMuonMagFieldScale(headerin->GetMuonMagFieldScale()); - header->SetCentrality(headerin->GetCentrality()); - + + if(headerin->GetCentrality()){ + header->SetCentrality(new AliCentrality(*(headerin->GetCentralityP()))); + } else { + header->SetCentrality(0); + } + header->SetTriggerMask(headerin->GetTriggerMask()); header->SetTriggerCluster(headerin->GetTriggerCluster()); header->SetMagneticField(headerin->GetMagneticField()); @@ -245,7 +251,7 @@ void AliAnalysisTaskPHOSPi0CalibSelection::CreateAODFromESD() header->SetPeriodNumber(esd->GetPeriodNumber()); header->SetEventType(esd->GetEventType()); header->SetMuonMagFieldScale(-999.); // FIXME - header->SetCentrality(-999.); // FIXME + header->SetCentrality(0); // FIXME header->SetTriggerMask(esd->GetTriggerMask()); diff --git a/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx b/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx index 0d07bfc8fd7..3890e112638 100644 --- a/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx +++ b/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx @@ -45,7 +45,7 @@ #include #include "TRandom3.h" #include "AliTriggerAnalysis.h" -#include "AliESDCentrality.h" +#include "AliCentrality.h" class AliESDTrackCuts; class AliCFContainer; @@ -575,7 +575,7 @@ void AliAnalysisTaskGammaConversion::UserExec(Option_t */*option*/) if(fV0Reader->GetIsHeavyIon()){ if(fUseCentrality>0){ - AliESDCentrality *esdCentrality = fV0Reader->GetESDEvent()->GetCentrality(); + AliCentrality *esdCentrality = fV0Reader->GetESDEvent()->GetCentrality(); Int_t centralityC = -1; if(fUseCentrality==1){ diff --git a/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx b/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx index 31aee63fe46..d549e9eeed1 100644 --- a/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx +++ b/PWG4/JetTasks/AliAnalysisTaskJetServices.cxx @@ -38,7 +38,7 @@ #include "TDatabasePDG.h" #include "AliAnalysisTaskJetServices.h" -#include "AliESDCentrality.h" +#include "AliCentrality.h" #include "AliAnalysisDataContainer.h" #include "AliAnalysisDataSlot.h" #include "AliAnalysisManager.h" diff --git a/PWG4/PartCorrBase/AliAnaPartCorrBaseClass.h b/PWG4/PartCorrBase/AliAnaPartCorrBaseClass.h index a6e04348425..0ce2696b670 100755 --- a/PWG4/PartCorrBase/AliAnaPartCorrBaseClass.h +++ b/PWG4/PartCorrBase/AliAnaPartCorrBaseClass.h @@ -33,7 +33,7 @@ class AliGenEventHeader ; class AliEMCALGeoUtils; class AliPHOSGeoUtils; #include "AliMixedEvent.h" -#include "AliESDCentrality.h" +#include "AliCentrality.h" class AliAnaPartCorrBaseClass : public TObject { @@ -87,7 +87,7 @@ public: return fCaloUtils->GetModuleNumber(cluster);} //Centrality - AliESDCentrality* GetCentrality() const { return fReader->GetCentrality() ;} + AliCentrality* GetCentrality() const { return fReader->GetCentrality() ;} void SetCentralityClass(TString name) { fCentralityClass = name ;} void SetCentralityOpt(Int_t opt) { fCentralityOpt = opt ;} TString GetCentralityClass() const { return fCentralityClass ;} diff --git a/PWG4/PartCorrBase/AliCaloTrackAODReader.h b/PWG4/PartCorrBase/AliCaloTrackAODReader.h index 8ff4ed6876c..18b275da575 100755 --- a/PWG4/PartCorrBase/AliCaloTrackAODReader.h +++ b/PWG4/PartCorrBase/AliCaloTrackAODReader.h @@ -37,7 +37,7 @@ public: TString GetFiredTriggerClasses() {return ((AliAODEvent*)GetInputEvent())->GetFiredTriggerClasses();} - AliESDCentrality* GetCentrality() const {return 0x0;} + AliCentrality* GetCentrality() const {return 0x0;} ClassDef(AliCaloTrackAODReader,5) diff --git a/PWG4/PartCorrBase/AliCaloTrackESDReader.h b/PWG4/PartCorrBase/AliCaloTrackESDReader.h index 852f6131b96..86ba5cfe1e5 100755 --- a/PWG4/PartCorrBase/AliCaloTrackESDReader.h +++ b/PWG4/PartCorrBase/AliCaloTrackESDReader.h @@ -18,7 +18,7 @@ // --- AliRoot system --- #include "AliCaloTrackReader.h" #include "AliESDEvent.h" -//class AliESDCentrality; +class AliCentrality; class AliCaloTrackESDReader : public AliCaloTrackReader { @@ -34,7 +34,7 @@ class AliCaloTrackESDReader : public AliCaloTrackReader { TString GetFiredTriggerClasses() {return ((AliESDEvent*)GetInputEvent())->GetFiredTriggerClasses();} - AliESDCentrality* GetCentrality() const {AliESDEvent* event = dynamic_cast (fInputEvent); + AliCentrality* GetCentrality() const {AliESDEvent* event = dynamic_cast (fInputEvent); if(event) return event->GetCentrality(); else return 0x0;} void FillInputVZERO(); diff --git a/PWG4/PartCorrBase/AliCaloTrackMCReader.h b/PWG4/PartCorrBase/AliCaloTrackMCReader.h index a6f8bfc6836..3375f77af4e 100755 --- a/PWG4/PartCorrBase/AliCaloTrackMCReader.h +++ b/PWG4/PartCorrBase/AliCaloTrackMCReader.h @@ -89,7 +89,7 @@ public: void SetEMCALOverlapAngle(Float_t angle) {fEMCALOverlapAngle = angle;} void SetPHOSOverlapAngle(Float_t angle) {fPHOSOverlapAngle = angle;} - AliESDCentrality* GetCentrality() const {return 0x0;} + AliCentrality* GetCentrality() const {return 0x0;} private: diff --git a/PWG4/PartCorrBase/AliCaloTrackReader.h b/PWG4/PartCorrBase/AliCaloTrackReader.h index 5aac1f933e9..728d7297acf 100755 --- a/PWG4/PartCorrBase/AliCaloTrackReader.h +++ b/PWG4/PartCorrBase/AliCaloTrackReader.h @@ -36,7 +36,7 @@ class AliMixedEvent; class AliAODMCHeader; #include "AliCalorimeterUtils.h" class AliESDtrackCuts; -class AliESDCentrality; +class AliCentrality; class AliCaloTrackReader : public TObject { @@ -226,7 +226,7 @@ public: Bool_t IsCaloFilterPatchOn() {if(fDataType == kAOD) { return fCaloFilterPatch ; } else { return kFALSE ; } } - virtual AliESDCentrality* GetCentrality() const {return 0x0;} + virtual AliCentrality* GetCentrality() const {return 0x0;} //MC reader methods: diff --git a/PWG4/totEt/AliAnalysisEt.h b/PWG4/totEt/AliAnalysisEt.h index 930d5f75afb..826be3fc67f 100644 --- a/PWG4/totEt/AliAnalysisEt.h +++ b/PWG4/totEt/AliAnalysisEt.h @@ -9,7 +9,7 @@ #ifndef ALIANALYSISET_H #define ALIANALYSISET_H -class AliESDCentrality; +class AliCentrality; #include "AliAnalysisEtCommon.h" class TString; @@ -76,7 +76,7 @@ public: void SetTPCOnlyTrackCuts(const AliESDtrackCuts *cuts){ fEsdtrackCutsTPC = (AliESDtrackCuts *) cuts;} /** Set the centrality object */ - void SetCentralityObject(AliESDCentrality *cent) { fCentrality = cent; } + void SetCentralityObject(AliCentrality *cent) { fCentrality = cent; } protected: @@ -202,7 +202,7 @@ protected: TTree *fTreeDeposit; // optional TTree for energy deposit measurements /** Centrality object */ - AliESDCentrality *fCentrality; //Centrality object + AliCentrality *fCentrality; //Centrality object private: //Declare private to avoid compilation warning diff --git a/PWG4/totEt/AliAnalysisTaskHadEt.cxx b/PWG4/totEt/AliAnalysisTaskHadEt.cxx index 8cd1b978dc0..31602fe02cd 100644 --- a/PWG4/totEt/AliAnalysisTaskHadEt.cxx +++ b/PWG4/totEt/AliAnalysisTaskHadEt.cxx @@ -141,7 +141,7 @@ if (!fESDEvent) { Int_t res = CheckPhysicsSelection(fESDEvent->GetRunNumber()); // Check if the physics selection is valid for this run -AliESDCentrality *cent = GetCentralityObject(); +AliCentrality *cent = GetCentralityObject(); if(res == 0 && cent){ diff --git a/PWG4/totEt/AliAnalysisTaskTotEt.cxx b/PWG4/totEt/AliAnalysisTaskTotEt.cxx index 07a3407baaf..c0c818dad0f 100644 --- a/PWG4/totEt/AliAnalysisTaskTotEt.cxx +++ b/PWG4/totEt/AliAnalysisTaskTotEt.cxx @@ -151,7 +151,7 @@ void AliAnalysisTaskTotEt::UserExec(Option_t *) Int_t res = CheckPhysicsSelection(fESDEvent->GetRunNumber()); - AliESDCentrality *cent = GetCentralityObject(); + AliCentrality *cent = GetCentralityObject(); if (res == 0 && cent) { diff --git a/PWG4/totEt/AliAnalysisTaskTransverseEnergy.cxx b/PWG4/totEt/AliAnalysisTaskTransverseEnergy.cxx index ac6a8f54f48..e362f8398e1 100644 --- a/PWG4/totEt/AliAnalysisTaskTransverseEnergy.cxx +++ b/PWG4/totEt/AliAnalysisTaskTransverseEnergy.cxx @@ -4,7 +4,7 @@ #include "AliInputEventHandler.h" #include "AliPhysicsSelectionTask.h" #include "AliPhysicsSelection.h" -#include "AliESDCentrality.h" +#include "AliCentrality.h" #include "AliESDEvent.h" //_________________________________________________________________________ // Utility Class for transverse energy studies @@ -116,7 +116,7 @@ Int_t AliAnalysisTaskTransverseEnergy::LoadPhysicsSelection(TString name) return 0; } -AliESDCentrality* AliAnalysisTaskTransverseEnergy::GetCentralityObject() +AliCentrality* AliAnalysisTaskTransverseEnergy::GetCentralityObject() { // See header file for class documentation if (fESDEvent)return fESDEvent->GetCentrality(); diff --git a/PWG4/totEt/AliAnalysisTaskTransverseEnergy.h b/PWG4/totEt/AliAnalysisTaskTransverseEnergy.h index 111be95214d..bb92bdb26d1 100644 --- a/PWG4/totEt/AliAnalysisTaskTransverseEnergy.h +++ b/PWG4/totEt/AliAnalysisTaskTransverseEnergy.h @@ -10,7 +10,7 @@ #include "AliAnalysisTaskSE.h" -class AliESDCentrality; +class AliCentrality; class AliAnalysisEtSelectionHandler; class AliESDtrackCuts; class AliESDEvent; @@ -44,7 +44,7 @@ protected: Bool_t IsPhysicsSelected() const; /** Get the centrality object */ - AliESDCentrality* GetCentralityObject(); + AliCentrality* GetCentralityObject(); /** The ESD event */ AliESDEvent *fESDEvent; //The ESD event -- 2.43.0