From a2cdb42c236dd08f069c05361b1debed8d380297 Mon Sep 17 00:00:00 2001 From: jgrosseo Date: Wed, 10 Sep 2008 11:34:33 +0000 Subject: [PATCH] adding trigger as flag --- PWG0/multiplicity/AliMultiplicityTask.cxx | 6 ++---- PWG0/multiplicity/AliMultiplicityTask.h | 4 ++++ PWG0/multiplicity/run.C | 6 +++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/PWG0/multiplicity/AliMultiplicityTask.cxx b/PWG0/multiplicity/AliMultiplicityTask.cxx index 061b0519de1..d4a3ccc4ae8 100644 --- a/PWG0/multiplicity/AliMultiplicityTask.cxx +++ b/PWG0/multiplicity/AliMultiplicityTask.cxx @@ -41,6 +41,7 @@ AliMultiplicityTask::AliMultiplicityTask(const char* opt) : fESD(0), fOption(opt), fAnalysisMode(AliPWG0Helper::kSPD), + fTrigger(AliPWG0Helper::kMB1), fReadMC(kFALSE), fUseMCVertex(kFALSE), fMultiplicity(0), @@ -206,10 +207,7 @@ void AliMultiplicityTask::Exec(Option_t*) return; } - //MB1 definition - Bool_t eventTriggered = AliPWG0Helper::IsEventTriggered(fESD->GetTriggerMask(), AliPWG0Helper::kMB1); - // only FASTOR - //Bool_t eventTriggered = fESD->GetTriggerMask() & 32; + Bool_t eventTriggered = AliPWG0Helper::IsEventTriggered(fESD->GetTriggerMask(), fTrigger); const AliESDVertex* vtxESD = AliPWG0Helper::GetVertex(fESD, fAnalysisMode); Bool_t eventVertex = (vtxESD != 0); diff --git a/PWG0/multiplicity/AliMultiplicityTask.h b/PWG0/multiplicity/AliMultiplicityTask.h index fa4ef1487db..c71cf0c61c4 100644 --- a/PWG0/multiplicity/AliMultiplicityTask.h +++ b/PWG0/multiplicity/AliMultiplicityTask.h @@ -29,6 +29,8 @@ class AliMultiplicityTask : public AliAnalysisTask { void SetPtSpectrum(TH1* hist) { fPtSpectrum = hist; } void SetAnalysisMode(AliPWG0Helper::AnalysisMode mode) { fAnalysisMode = mode; } + void SetTrigger(AliPWG0Helper::Trigger trigger) { fTrigger = trigger; } + void SetReadMC(Bool_t flag = kTRUE) { fReadMC = flag; } void SetUseMCVertex(Bool_t flag = kTRUE) { fUseMCVertex = flag; } @@ -37,6 +39,8 @@ class AliMultiplicityTask : public AliAnalysisTask { TString fOption; // option string AliPWG0Helper::AnalysisMode fAnalysisMode; // detector that is used for analysis + AliPWG0Helper::Trigger fTrigger; // trigger that is used + Bool_t fReadMC; // if true reads MC data (to build correlation maps) Bool_t fUseMCVertex; // the MC vtx is used instead of the ESD vertex (for syst. check) diff --git a/PWG0/multiplicity/run.C b/PWG0/multiplicity/run.C index 200a8f94aa4..55f9d9ddba9 100644 --- a/PWG0/multiplicity/run.C +++ b/PWG0/multiplicity/run.C @@ -49,7 +49,10 @@ void run(Char_t* data, Long64_t nRuns = -1, Long64_t offset = 0, Bool_t aDebug = // Create the analysis manager mgr = new AliAnalysisManager; - AliPWG0Helper::AnalysisMode analysisMode = AliPWG0Helper::kTPCITS; + AliPWG0Helper::AnalysisMode analysisMode = AliPWG0Helper::kTPC; + AliPWG0Helper::Trigger trigger = AliPWG0Helper::kMB1; + + AliPWG0Helper::PrintConf(analysisMode, trigger); TString taskName("AliMultiplicityTask.cxx+"); if (aDebug) @@ -78,6 +81,7 @@ void run(Char_t* data, Long64_t nRuns = -1, Long64_t offset = 0, Bool_t aDebug = } task->SetAnalysisMode(analysisMode); + task->SetTrigger(trigger); if (mc) task->SetReadMC(); -- 2.39.3