From 1afd2cb72b62e586c86c258be0b57ea4ae26c9fc Mon Sep 17 00:00:00 2001
From: Evgeny Kryshen <evgeny.kryshen@cern.ch>
Date: Sat, 20 Mar 2021 10:02:23 +0300
Subject: [PATCH 1/4] BC selection task and alias accounting added

---
 .../AnalysisDataModel/EventSelection.h        | 27 ++++++++
 Analysis/Tasks/eventSelection.cxx             | 69 ++++++++++++++-----
 Analysis/Tasks/eventSelectionQa.cxx           | 12 +++-
 .../include/Framework/AnalysisDataModel.h     |  2 +
 Framework/Core/src/AODReaderHelpers.cxx       |  4 +-
 5 files changed, 92 insertions(+), 22 deletions(-)

diff --git a/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h b/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h
index ffe5af699d1dd..e30a1624f1fbc 100644
--- a/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h
+++ b/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h
@@ -15,6 +15,7 @@
 
 namespace o2::aod
 {
+// collision-joinable event selection decisions
 namespace evsel
 {
 // TODO bool arrays are not supported? Storing in int32 for the moment
@@ -44,6 +45,32 @@ DECLARE_SOA_TABLE(EvSels, "AOD", "EVSEL",
                   evsel::SEL8<evsel::BBT0A, evsel::BBT0C, evsel::BBZNA, evsel::BBZNC>,
                   evsel::FoundFT0);
 using EvSel = EvSels::iterator;
+
+// bc-joinable event selection decisions
+namespace bcsel
+{
+// TODO bool arrays are not supported? Storing in int32 for the moment
+DECLARE_SOA_COLUMN(Alias, alias, int32_t[kNaliases]);
+DECLARE_SOA_COLUMN(BBT0A, bbT0A, bool); // beam-beam time in T0A
+DECLARE_SOA_COLUMN(BBT0C, bbT0C, bool); // beam-beam time in T0C
+DECLARE_SOA_COLUMN(BBV0A, bbV0A, bool); // beam-beam time in V0A
+DECLARE_SOA_COLUMN(BBV0C, bbV0C, bool); // beam-beam time in V0C
+DECLARE_SOA_COLUMN(BGV0A, bgV0A, bool); // beam-gas time in V0A
+DECLARE_SOA_COLUMN(BGV0C, bgV0C, bool); // beam-gas time in V0C
+DECLARE_SOA_COLUMN(BBZNA, bbZNA, bool); // beam-beam time in ZNA
+DECLARE_SOA_COLUMN(BBZNC, bbZNC, bool); // beam-beam time in ZNC
+DECLARE_SOA_COLUMN(BBFDA, bbFDA, bool); // beam-beam time in FDA
+DECLARE_SOA_COLUMN(BBFDC, bbFDC, bool); // beam-beam time in FDC
+DECLARE_SOA_COLUMN(BGFDA, bgFDA, bool); // beam-gas time in FDA
+DECLARE_SOA_COLUMN(BGFDC, bgFDC, bool); // beam-gas time in FDC
+} // namespace bcsel
+DECLARE_SOA_TABLE(BcSels, "AOD", "BCSEL",
+                  bcsel::Alias,
+                  bcsel::BBT0A, bcsel::BBT0C,
+                  bcsel::BBV0A, bcsel::BBV0C, bcsel::BGV0A, bcsel::BGV0C,
+                  bcsel::BBZNA, bcsel::BBZNC,
+                  bcsel::BBFDA, bcsel::BBFDC, bcsel::BGFDA, bcsel::BGFDC);
+using BcSel = BcSels::iterator;
 } // namespace o2::aod
 
 #endif // O2_ANALYSIS_EVENTSELECTION_H_
diff --git a/Analysis/Tasks/eventSelection.cxx b/Analysis/Tasks/eventSelection.cxx
index 7bf0601b8e08e..dfc47e566453a 100644
--- a/Analysis/Tasks/eventSelection.cxx
+++ b/Analysis/Tasks/eventSelection.cxx
@@ -67,13 +67,11 @@ struct EvSelParameters {
   float fT0CBBupper = 2.0;  // ns
 };
 
-struct EventSelectionTask {
-  Produces<aod::EvSels> evsel;
-  Service<o2::ccdb::BasicCCDBManager> ccdb;
-  Configurable<bool> isMC{"isMC", 0, "0 - data, 1 - MC"};
 
+struct BcSelectionTask {
+  Produces<aod::BcSels> bcsel;
+  Service<o2::ccdb::BasicCCDBManager> ccdb;
   EvSelParameters par;
-
   void init(InitContext&)
   {
     ccdb->setURL("http://ccdb-test.cern.ch:8080");
@@ -81,17 +79,16 @@ struct EventSelectionTask {
     ccdb->setLocalObjectValidityChecking();
   }
 
-  using BCsWithTimestampsAndRun2Infos = soa::Join<aod::BCsWithTimestamps, aod::Run2BCInfos>;
+  using BCsWithRun2InfosTimestampsAndMatches = soa::Join<aod::BCs, aod::Run2BCInfos, aod::Timestamps, aod::Run2MatchedToBCSparse>;
+
   void process(
-    aod::Run2MatchedSparse::iterator const& col,
-    BCsWithTimestampsAndRun2Infos const& bcs,
+    BCsWithRun2InfosTimestampsAndMatches::iterator const& bc,
     aod::Zdcs const& zdcs,
     aod::FV0As const& fv0as,
     aod::FV0Cs const& fv0cs,
     aod::FT0s const& ft0s,
     aod::FDDs const& fdds)
   {
-    auto bc = col.bc_as<BCsWithTimestampsAndRun2Infos>();
     TriggerAliases* aliases = ccdb->getForTimeStamp<TriggerAliases>("Trigger/TriggerAliases", bc.timestamp());
     if (!aliases) {
       LOGF(fatal, "Trigger aliases are not available in CCDB for run=%d at timestamp=%llu", bc.runNumber(), bc.timestamp());
@@ -108,14 +105,14 @@ struct EventSelectionTask {
       alias[al.first] |= (triggerMaskNext50 & al.second) > 0;
     }
 
-    float timeZNA = col.has_zdc() ? col.zdc().timeZNA() : -999.f;
-    float timeZNC = col.has_zdc() ? col.zdc().timeZNC() : -999.f;
-    float timeV0A = col.has_fv0a() ? col.fv0a().time() : -999.f;
-    float timeV0C = col.has_fv0c() ? col.fv0c().time() : -999.f;
-    float timeT0A = col.has_ft0() ? col.ft0().timeA() : -999.f;
-    float timeT0C = col.has_ft0() ? col.ft0().timeC() : -999.f;
-    float timeFDA = col.has_fdd() ? col.fdd().timeA() : -999.f;
-    float timeFDC = col.has_fdd() ? col.fdd().timeC() : -999.f;
+    float timeZNA = bc.has_zdc() ? bc.zdc().timeZNA() : -999.f;
+    float timeZNC = bc.has_zdc() ? bc.zdc().timeZNC() : -999.f;
+    float timeV0A = bc.has_fv0a() ? bc.fv0a().time() : -999.f;
+    float timeV0C = bc.has_fv0c() ? bc.fv0c().time() : -999.f;
+    float timeT0A = bc.has_ft0() ? bc.ft0().timeA() : -999.f;
+    float timeT0C = bc.has_ft0() ? bc.ft0().timeC() : -999.f;
+    float timeFDA = bc.has_fdd() ? bc.fdd().timeA() : -999.f;
+    float timeFDC = bc.has_fdd() ? bc.fdd().timeC() : -999.f;
 
     LOGF(debug, "timeZNA=%f timeZNC=%f", timeZNA, timeZNC);
     LOGF(debug, "timeV0A=%f timeV0C=%f", timeV0A, timeV0C);
@@ -135,17 +132,49 @@ struct EventSelectionTask {
     bool bbT0A = timeT0A > par.fT0ABBlower && timeT0A < par.fT0ABBupper;
     bool bbT0C = timeT0C > par.fT0CBBlower && timeT0C < par.fT0CBBupper;
 
+    // Fill bc selection columns
+    bcsel(alias, bbT0A, bbT0C, bbV0A, bbV0C, bgV0A, bgV0C, bbZNA, bbZNC, bbFDA, bbFDC, bgFDA, bgFDC);
+  }
+};
+
+
+struct EventSelectionTask {
+  Produces<aod::EvSels> evsel;
+  Configurable<bool> isMC{"isMC", 0, "0 - data, 1 - MC"};
+
+  using BCsWithBcSels = soa::Join<aod::BCs, aod::BcSels>;
+
+  void process(aod::Collision const& col,  BCsWithBcSels const& bcs)
+  {
+    auto bc = col.bc_as<BCsWithBcSels>();
+    int32_t alias[kNaliases];
+    for (int i = 0; i < kNaliases; i++) {
+      alias[i] = bc.alias()[i];
+    }
+    bool bbZNA = bc.bbZNA();
+    bool bbZNC = bc.bbZNC();
+    bool bbV0A = bc.bbV0A();
+    bool bbV0C = bc.bbV0C();
+    bool bgV0A = bc.bgV0A();
+    bool bgV0C = bc.bgV0C();
+    bool bbFDA = bc.bbFDA();
+    bool bbFDC = bc.bbFDC();
+    bool bgFDA = bc.bgFDA();
+    bool bgFDC = bc.bgFDA();
+    bool bbT0A = bc.bbT0A();
+    bool bbT0C = bc.bbT0C();
+
     if (isMC) {
       bbZNA = 1;
       bbZNC = 1;
     }
-
     // Fill event selection columns
     int64_t foundFT0 = -1; // this column is not used in run2 analysis
     evsel(alias, bbT0A, bbT0C, bbV0A, bbV0C, bgV0A, bgV0C, bbZNA, bbZNC, bbFDA, bbFDC, bgFDA, bgFDC, foundFT0);
   }
 };
 
+
 struct EventSelectionTaskRun3 {
   Produces<aod::EvSels> evsel;
 
@@ -220,7 +249,9 @@ struct EventSelectionTaskRun3 {
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   if (cfgc.options().get<int>("selection-run") == 2) {
-    return WorkflowSpec{adaptAnalysisTask<EventSelectionTask>(cfgc)};
+    return WorkflowSpec{
+      adaptAnalysisTask<BcSelectionTask>(cfgc),
+      adaptAnalysisTask<EventSelectionTask>(cfgc)};
   } else {
     return WorkflowSpec{
       adaptAnalysisTask<EventSelectionTaskRun3>(cfgc)};
diff --git a/Analysis/Tasks/eventSelectionQa.cxx b/Analysis/Tasks/eventSelectionQa.cxx
index af62185cf8fb0..1476e4872a5cb 100644
--- a/Analysis/Tasks/eventSelectionQa.cxx
+++ b/Analysis/Tasks/eventSelectionQa.cxx
@@ -16,9 +16,12 @@ using namespace o2;
 using namespace o2::framework;
 
 struct EventSelectionQaPerBc {
+  // TODO fill aliases and class names in axis labels
   OutputObj<TH1F> hFiredClasses{TH1F("hFiredClasses", "", 100, -0.5, 99.5)};
-  void process(soa::Join<aod::BCs, aod::Run2BCInfos>::iterator const& bc)
+  OutputObj<TH1F> hFiredAliases{TH1F("hFiredAliases", "", kNaliases, -0.5, kNaliases)};
+  void process(soa::Join<aod::BCs, aod::Run2BCInfos, aod::BcSels>::iterator const& bc)
   {
+    // Fill fired trigger classes
     uint64_t triggerMask = bc.triggerMask();
     uint64_t triggerMaskNext50 = bc.triggerMaskNext50();
     for (int i = 0; i < 50; i++) {
@@ -29,6 +32,13 @@ struct EventSelectionQaPerBc {
         hFiredClasses->Fill(i + 50);
       }
     }
+
+    // Fill fired aliases
+    for (int i = 0; i < kNaliases; i++) {
+      if (bc.alias()[i]) {
+        hFiredAliases->Fill(i);
+      }
+    }
   }
 };
 
diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h
index b314cb9203877..62d315d053d04 100644
--- a/Framework/Core/include/Framework/AnalysisDataModel.h
+++ b/Framework/Core/include/Framework/AnalysisDataModel.h
@@ -808,6 +808,8 @@ DECLARE_SOA_INDEX_TABLE(MatchedBCCollisionsSparse, BCs, "MA_BCCOL_SP", indices::
 DECLARE_SOA_INDEX_TABLE_EXCLUSIVE(Run3MatchedToBCExclusive, BCs, "MA_RN3_BC_EX", indices::BCId, indices::ZdcId, indices::FT0Id, indices::FV0AId, indices::FDDId);
 DECLARE_SOA_INDEX_TABLE(Run3MatchedToBCSparse, BCs, "MA_RN3_BC_SP", indices::BCId, indices::ZdcId, indices::FT0Id, indices::FV0AId, indices::FDDId);
 
+DECLARE_SOA_INDEX_TABLE(Run2MatchedToBCSparse, BCs, "MA_RN2_BC_SP", indices::BCId, indices::ZdcId, indices::FT0Id, indices::FV0AId, indices::FV0CId, indices::FDDId);
+
 // Joins with collisions (only for sparse ones)
 // NOTE: index table needs to be always last argument
 using CollisionMatchedRun2Sparse = soa::Join<Collisions, Run2MatchedSparse>::iterator;
diff --git a/Framework/Core/src/AODReaderHelpers.cxx b/Framework/Core/src/AODReaderHelpers.cxx
index a317209e7ee30..70727052e247e 100644
--- a/Framework/Core/src/AODReaderHelpers.cxx
+++ b/Framework/Core/src/AODReaderHelpers.cxx
@@ -86,7 +86,6 @@ static inline auto extractOriginalsTuple(framework::pack<Os...>, ProcessingConte
 AlgorithmSpec AODReaderHelpers::indexBuilderCallback(std::vector<InputSpec> requested)
 {
   return AlgorithmSpec::InitCallback{[requested](InitContext& ic) {
-
     return [requested](ProcessingContext& pc) {
       auto outputs = pc.outputs();
       // spawn tables
@@ -135,6 +134,8 @@ AlgorithmSpec AODReaderHelpers::indexBuilderCallback(std::vector<InputSpec> requ
           outputs.adopt(Output{origin, description}, maker(o2::aod::Run3MatchedToBCSparseMetadata{}));
         } else if (description == header::DataDescription{"MA_RN3_BC_EX"}) {
           outputs.adopt(Output{origin, description}, maker(o2::aod::Run3MatchedToBCExclusiveMetadata{}));
+        } else if (description == header::DataDescription{"MA_RN2_BC_SP"}) {
+          outputs.adopt(Output{origin, description}, maker(o2::aod::Run2MatchedToBCSparseMetadata{}));
         } else {
           throw std::runtime_error("Not an index table");
         }
@@ -146,7 +147,6 @@ AlgorithmSpec AODReaderHelpers::indexBuilderCallback(std::vector<InputSpec> requ
 AlgorithmSpec AODReaderHelpers::aodSpawnerCallback(std::vector<InputSpec> requested)
 {
   return AlgorithmSpec::InitCallback{[requested](InitContext& ic) {
-
     return [requested](ProcessingContext& pc) {
       auto outputs = pc.outputs();
       // spawn tables

From 7b27fcd7fd7c230abe6c5ad2c32e8506f89e1916 Mon Sep 17 00:00:00 2001
From: Evgeny Kryshen <evgeny.kryshen@cern.ch>
Date: Sat, 20 Mar 2021 15:57:59 +0300
Subject: [PATCH 2/4] clang-format fixes

---
 Analysis/Tasks/eventSelection.cxx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Analysis/Tasks/eventSelection.cxx b/Analysis/Tasks/eventSelection.cxx
index dfc47e566453a..d52077a299cf8 100644
--- a/Analysis/Tasks/eventSelection.cxx
+++ b/Analysis/Tasks/eventSelection.cxx
@@ -67,7 +67,6 @@ struct EvSelParameters {
   float fT0CBBupper = 2.0;  // ns
 };
 
-
 struct BcSelectionTask {
   Produces<aod::BcSels> bcsel;
   Service<o2::ccdb::BasicCCDBManager> ccdb;
@@ -137,14 +136,13 @@ struct BcSelectionTask {
   }
 };
 
-
 struct EventSelectionTask {
   Produces<aod::EvSels> evsel;
   Configurable<bool> isMC{"isMC", 0, "0 - data, 1 - MC"};
 
   using BCsWithBcSels = soa::Join<aod::BCs, aod::BcSels>;
 
-  void process(aod::Collision const& col,  BCsWithBcSels const& bcs)
+  void process(aod::Collision const& col, BCsWithBcSels const& bcs)
   {
     auto bc = col.bc_as<BCsWithBcSels>();
     int32_t alias[kNaliases];
@@ -174,7 +172,6 @@ struct EventSelectionTask {
   }
 };
 
-
 struct EventSelectionTaskRun3 {
   Produces<aod::EvSels> evsel;
 

From bb7127ab13eea4d6cf84685b32eab54a69b773e1 Mon Sep 17 00:00:00 2001
From: Evgeny Kryshen <evgeny.kryshen@cern.ch>
Date: Wed, 24 Mar 2021 21:00:49 +0300
Subject: [PATCH 3/4] bcsel namespace removed. alias labels added. +bug fixes

---
 .../include/AnalysisCore/TriggerAliases.h     | 14 +++++++++
 Analysis/Core/src/TriggerAliases.cxx          |  2 +-
 .../AnalysisDataModel/EventSelection.h        | 31 +++++--------------
 Analysis/Tasks/eventSelection.cxx             |  2 +-
 Analysis/Tasks/eventSelectionQa.cxx           | 14 +++++++--
 5 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/Analysis/Core/include/AnalysisCore/TriggerAliases.h b/Analysis/Core/include/AnalysisCore/TriggerAliases.h
index 8aa88c10b78e1..af6205c92ef8a 100644
--- a/Analysis/Core/include/AnalysisCore/TriggerAliases.h
+++ b/Analysis/Core/include/AnalysisCore/TriggerAliases.h
@@ -31,6 +31,20 @@ enum triggerAliases {
   kNaliases
 };
 
+static const std::string aliasLabels[kNaliases] = {
+    "kINT7",
+    "kEMC7",
+    "kINT7inMUON",
+    "kMuonSingleLowPt7",
+    "kMuonSingleHighPt7",
+    "kMuonUnlikeLowPt7",
+    "kMuonLikeLowPt7",
+    "kCUP8",
+    "kCUP9",
+    "kMUP10",
+    "kMUP11"
+};
+
 class TriggerAliases
 {
  public:
diff --git a/Analysis/Core/src/TriggerAliases.cxx b/Analysis/Core/src/TriggerAliases.cxx
index b4525a84fe186..9941a50ced047 100644
--- a/Analysis/Core/src/TriggerAliases.cxx
+++ b/Analysis/Core/src/TriggerAliases.cxx
@@ -18,6 +18,6 @@ void TriggerAliases::AddClassIdToAlias(uint32_t aliasId, int classId)
   } else if (classId < 50) {
     mAliasToTriggerMask[aliasId] |= 1ull << classId;
   } else {
-    mAliasToTriggerMaskNext50[aliasId] |= 1ull << classId;
+    mAliasToTriggerMaskNext50[aliasId] |= 1ull << (classId-50);
   }
 }
diff --git a/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h b/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h
index e30a1624f1fbc..d92318943ed8b 100644
--- a/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h
+++ b/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h
@@ -39,37 +39,20 @@ DECLARE_SOA_DYNAMIC_COLUMN(SEL8, sel8, [](bool bbT0A, bool bbT0C, bool bbZNA, bo
 DECLARE_SOA_TABLE(EvSels, "AOD", "EVSEL",
                   evsel::Alias,
                   evsel::BBT0A, evsel::BBT0C,
-                  evsel::BBV0A, evsel::BBV0C, evsel::BGV0A, evsel::BGV0C, evsel::BBZNA, evsel::BBZNC,
+                  evsel::BBV0A, evsel::BBV0C, evsel::BGV0A, evsel::BGV0C, 
+                  evsel::BBZNA, evsel::BBZNC,
                   evsel::BBFDA, evsel::BBFDC, evsel::BGFDA, evsel::BGFDC,
                   evsel::SEL7<evsel::BBV0A, evsel::BBV0C, evsel::BBZNA, evsel::BBZNC>,
                   evsel::SEL8<evsel::BBT0A, evsel::BBT0C, evsel::BBZNA, evsel::BBZNC>,
                   evsel::FoundFT0);
 using EvSel = EvSels::iterator;
 
-// bc-joinable event selection decisions
-namespace bcsel
-{
-// TODO bool arrays are not supported? Storing in int32 for the moment
-DECLARE_SOA_COLUMN(Alias, alias, int32_t[kNaliases]);
-DECLARE_SOA_COLUMN(BBT0A, bbT0A, bool); // beam-beam time in T0A
-DECLARE_SOA_COLUMN(BBT0C, bbT0C, bool); // beam-beam time in T0C
-DECLARE_SOA_COLUMN(BBV0A, bbV0A, bool); // beam-beam time in V0A
-DECLARE_SOA_COLUMN(BBV0C, bbV0C, bool); // beam-beam time in V0C
-DECLARE_SOA_COLUMN(BGV0A, bgV0A, bool); // beam-gas time in V0A
-DECLARE_SOA_COLUMN(BGV0C, bgV0C, bool); // beam-gas time in V0C
-DECLARE_SOA_COLUMN(BBZNA, bbZNA, bool); // beam-beam time in ZNA
-DECLARE_SOA_COLUMN(BBZNC, bbZNC, bool); // beam-beam time in ZNC
-DECLARE_SOA_COLUMN(BBFDA, bbFDA, bool); // beam-beam time in FDA
-DECLARE_SOA_COLUMN(BBFDC, bbFDC, bool); // beam-beam time in FDC
-DECLARE_SOA_COLUMN(BGFDA, bgFDA, bool); // beam-gas time in FDA
-DECLARE_SOA_COLUMN(BGFDC, bgFDC, bool); // beam-gas time in FDC
-} // namespace bcsel
 DECLARE_SOA_TABLE(BcSels, "AOD", "BCSEL",
-                  bcsel::Alias,
-                  bcsel::BBT0A, bcsel::BBT0C,
-                  bcsel::BBV0A, bcsel::BBV0C, bcsel::BGV0A, bcsel::BGV0C,
-                  bcsel::BBZNA, bcsel::BBZNC,
-                  bcsel::BBFDA, bcsel::BBFDC, bcsel::BGFDA, bcsel::BGFDC);
+                  evsel::Alias,
+                  evsel::BBT0A, evsel::BBT0C,
+                  evsel::BBV0A, evsel::BBV0C, evsel::BGV0A, evsel::BGV0C,
+                  evsel::BBZNA, evsel::BBZNC,
+                  evsel::BBFDA, evsel::BBFDC, evsel::BGFDA, evsel::BGFDC);
 using BcSel = BcSels::iterator;
 } // namespace o2::aod
 
diff --git a/Analysis/Tasks/eventSelection.cxx b/Analysis/Tasks/eventSelection.cxx
index d52077a299cf8..bcced7989de2a 100644
--- a/Analysis/Tasks/eventSelection.cxx
+++ b/Analysis/Tasks/eventSelection.cxx
@@ -158,7 +158,7 @@ struct EventSelectionTask {
     bool bbFDA = bc.bbFDA();
     bool bbFDC = bc.bbFDC();
     bool bgFDA = bc.bgFDA();
-    bool bgFDC = bc.bgFDA();
+    bool bgFDC = bc.bgFDC();
     bool bbT0A = bc.bbT0A();
     bool bbT0C = bc.bbT0C();
 
diff --git a/Analysis/Tasks/eventSelectionQa.cxx b/Analysis/Tasks/eventSelectionQa.cxx
index 1476e4872a5cb..74c4f66b3a980 100644
--- a/Analysis/Tasks/eventSelectionQa.cxx
+++ b/Analysis/Tasks/eventSelectionQa.cxx
@@ -11,14 +11,22 @@
 #include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
 #include "AnalysisDataModel/EventSelection.h"
+#include "AnalysisCore/TriggerAliases.h"
+#include "TH1F.h"
 
 using namespace o2;
 using namespace o2::framework;
 
 struct EventSelectionQaPerBc {
-  // TODO fill aliases and class names in axis labels
+  // TODO fill class names in axis labels
   OutputObj<TH1F> hFiredClasses{TH1F("hFiredClasses", "", 100, -0.5, 99.5)};
-  OutputObj<TH1F> hFiredAliases{TH1F("hFiredAliases", "", kNaliases, -0.5, kNaliases)};
+  OutputObj<TH1F> hFiredAliases{TH1F("hFiredAliases", "", kNaliases, -0.5, kNaliases-0.5)};
+  void init(InitContext&){
+    for (int i = 0; i < kNaliases; i++){
+      hFiredAliases->GetXaxis()->SetBinLabel(i+1,aliasLabels[i].data());
+    }
+  }
+  
   void process(soa::Join<aod::BCs, aod::Run2BCInfos, aod::BcSels>::iterator const& bc)
   {
     // Fill fired trigger classes
@@ -73,7 +81,7 @@ struct EventSelectionQaPerCollision {
     if (!isMC && !col.alias()[kINT7]) {
       return;
     }
-
+    
     float timeZNA = col.has_zdc() ? col.zdc().timeZNA() : -999.f;
     float timeZNC = col.has_zdc() ? col.zdc().timeZNC() : -999.f;
     float timeV0A = col.has_fv0a() ? col.fv0a().time() : -999.f;

From b7783f253c66cb816833b9e16692030f20c45ab2 Mon Sep 17 00:00:00 2001
From: Evgeny Kryshen <evgeny.kryshen@cern.ch>
Date: Wed, 24 Mar 2021 21:15:26 +0300
Subject: [PATCH 4/4] clang-format fixes

---
 .../include/AnalysisCore/TriggerAliases.h     | 23 +++++++++----------
 Analysis/Core/src/TriggerAliases.cxx          |  2 +-
 .../AnalysisDataModel/EventSelection.h        |  2 +-
 Analysis/Tasks/eventSelectionQa.cxx           | 13 ++++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Analysis/Core/include/AnalysisCore/TriggerAliases.h b/Analysis/Core/include/AnalysisCore/TriggerAliases.h
index af6205c92ef8a..2a5db96497d1a 100644
--- a/Analysis/Core/include/AnalysisCore/TriggerAliases.h
+++ b/Analysis/Core/include/AnalysisCore/TriggerAliases.h
@@ -32,18 +32,17 @@ enum triggerAliases {
 };
 
 static const std::string aliasLabels[kNaliases] = {
-    "kINT7",
-    "kEMC7",
-    "kINT7inMUON",
-    "kMuonSingleLowPt7",
-    "kMuonSingleHighPt7",
-    "kMuonUnlikeLowPt7",
-    "kMuonLikeLowPt7",
-    "kCUP8",
-    "kCUP9",
-    "kMUP10",
-    "kMUP11"
-};
+  "kINT7",
+  "kEMC7",
+  "kINT7inMUON",
+  "kMuonSingleLowPt7",
+  "kMuonSingleHighPt7",
+  "kMuonUnlikeLowPt7",
+  "kMuonLikeLowPt7",
+  "kCUP8",
+  "kCUP9",
+  "kMUP10",
+  "kMUP11"};
 
 class TriggerAliases
 {
diff --git a/Analysis/Core/src/TriggerAliases.cxx b/Analysis/Core/src/TriggerAliases.cxx
index 9941a50ced047..85e10392daf68 100644
--- a/Analysis/Core/src/TriggerAliases.cxx
+++ b/Analysis/Core/src/TriggerAliases.cxx
@@ -18,6 +18,6 @@ void TriggerAliases::AddClassIdToAlias(uint32_t aliasId, int classId)
   } else if (classId < 50) {
     mAliasToTriggerMask[aliasId] |= 1ull << classId;
   } else {
-    mAliasToTriggerMaskNext50[aliasId] |= 1ull << (classId-50);
+    mAliasToTriggerMaskNext50[aliasId] |= 1ull << (classId - 50);
   }
 }
diff --git a/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h b/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h
index d92318943ed8b..6b100004de17d 100644
--- a/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h
+++ b/Analysis/DataModel/include/AnalysisDataModel/EventSelection.h
@@ -39,7 +39,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(SEL8, sel8, [](bool bbT0A, bool bbT0C, bool bbZNA, bo
 DECLARE_SOA_TABLE(EvSels, "AOD", "EVSEL",
                   evsel::Alias,
                   evsel::BBT0A, evsel::BBT0C,
-                  evsel::BBV0A, evsel::BBV0C, evsel::BGV0A, evsel::BGV0C, 
+                  evsel::BBV0A, evsel::BBV0C, evsel::BGV0A, evsel::BGV0C,
                   evsel::BBZNA, evsel::BBZNC,
                   evsel::BBFDA, evsel::BBFDC, evsel::BGFDA, evsel::BGFDC,
                   evsel::SEL7<evsel::BBV0A, evsel::BBV0C, evsel::BBZNA, evsel::BBZNC>,
diff --git a/Analysis/Tasks/eventSelectionQa.cxx b/Analysis/Tasks/eventSelectionQa.cxx
index 74c4f66b3a980..f31f0e36080a3 100644
--- a/Analysis/Tasks/eventSelectionQa.cxx
+++ b/Analysis/Tasks/eventSelectionQa.cxx
@@ -20,13 +20,14 @@ using namespace o2::framework;
 struct EventSelectionQaPerBc {
   // TODO fill class names in axis labels
   OutputObj<TH1F> hFiredClasses{TH1F("hFiredClasses", "", 100, -0.5, 99.5)};
-  OutputObj<TH1F> hFiredAliases{TH1F("hFiredAliases", "", kNaliases, -0.5, kNaliases-0.5)};
-  void init(InitContext&){
-    for (int i = 0; i < kNaliases; i++){
-      hFiredAliases->GetXaxis()->SetBinLabel(i+1,aliasLabels[i].data());
+  OutputObj<TH1F> hFiredAliases{TH1F("hFiredAliases", "", kNaliases, -0.5, kNaliases - 0.5)};
+  void init(InitContext&)
+  {
+    for (int i = 0; i < kNaliases; i++) {
+      hFiredAliases->GetXaxis()->SetBinLabel(i + 1, aliasLabels[i].data());
     }
   }
-  
+
   void process(soa::Join<aod::BCs, aod::Run2BCInfos, aod::BcSels>::iterator const& bc)
   {
     // Fill fired trigger classes
@@ -81,7 +82,7 @@ struct EventSelectionQaPerCollision {
     if (!isMC && !col.alias()[kINT7]) {
       return;
     }
-    
+
     float timeZNA = col.has_zdc() ? col.zdc().timeZNA() : -999.f;
     float timeZNC = col.has_zdc() ? col.zdc().timeZNC() : -999.f;
     float timeV0A = col.has_fv0a() ? col.fv0a().time() : -999.f;