adding trigger as flag

diff --git a/PWG0/multiplicity/AliMultiplicityTask.cxx b/PWG0/multiplicity/AliMultiplicityTask.cxx
index 061b0519de1c7800725ac720e188961ae1285c83..d4a3ccc4ae87d9c96b38eddd7171992a6f670e60 100644 (file)
--- 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 fa4ef1487db95cc81726d4160b80c494b3e819e7..c71cf0c61c475b2b5505d679790ab07510c759b2 100644 (file)
--- 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 200a8f94aa4de476753eb19d25b7b515f05a2dd4..55f9d9ddba9b1f4b0139ad29dee626fbd9faf682 100644 (file)
--- 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();