Merge branch 'AliceO2Group:master' into master

Author: Shunsuke-Kurita

EventFiltering/Zorro.cxx

@@ -14,13 +14,46 @@
 
 #include <map>
 
-#include "TH1D.h"
+#include "TList.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonDataFormat/InteractionRecord.h"
 
 using o2::InteractionRecord;
 
+void Zorro::populateHistRegistry(o2::framework::HistogramRegistry& histRegistry, std::string prefix)
+{
+  TList* list = histRegistry.getListOfHistograms();
+  if (mSelections && list->FindObject((std::to_string(mRunNumber) + "/" + prefix + "Selections").data()) == nullptr) {
+    mAnalysedTriggers = histRegistry.add<TH1>((std::to_string(mRunNumber) + "/" + prefix + "AnalysedTriggers").data(), "", o2::framework::HistType::kTH1D, {{mSelections->GetNbinsX() - 2, -0.5, mSelections->GetNbinsX() - 2.5}});
+    for (int iBin{2}; iBin < mSelections->GetNbinsX(); ++iBin) { // Exclude first and last bins as they are total number of analysed and selected events, respectively
+      mAnalysedTriggers->GetXaxis()->SetBinLabel(iBin - 1, mSelections->GetXaxis()->GetBinLabel(iBin));
+    }
+    std::shared_ptr<TH1> selections = histRegistry.add<TH1>((std::to_string(mRunNumber) + "/" + prefix + "Selections").data(), "", o2::framework::HistType::kTH1D, {{mSelections->GetNbinsX(), -0.5, static_cast<double>(mSelections->GetNbinsX() - 0.5)}});
+    for (int iBin{1}; iBin <= mSelections->GetNbinsX(); ++iBin) {
+      selections->GetXaxis()->SetBinLabel(iBin, mSelections->GetXaxis()->GetBinLabel(iBin));
+      selections->SetBinContent(iBin, mSelections->GetBinContent(iBin));
+      selections->SetBinError(iBin, mSelections->GetBinError(iBin));
+    }
+  }
+  if (mScalers && list->FindObject((std::to_string(mRunNumber) + "/" + prefix + "Scalers").data()) == nullptr) {
+    std::shared_ptr<TH1> scalers = histRegistry.add<TH1>((std::to_string(mRunNumber) + "/" + prefix + "Scalers").data(), "", o2::framework::HistType::kTH1D, {{mScalers->GetNbinsX(), -0.5, static_cast<double>(mScalers->GetNbinsX() - 0.5)}});
+    for (int iBin{1}; iBin <= mScalers->GetNbinsX(); ++iBin) {
+      scalers->GetXaxis()->SetBinLabel(iBin, mScalers->GetXaxis()->GetBinLabel(iBin));
+      scalers->SetBinContent(iBin, mScalers->GetBinContent(iBin));
+      scalers->SetBinError(iBin, mScalers->GetBinError(iBin));
+    }
+  }
+  if (mInspectedTVX && list->FindObject((std::to_string(mRunNumber) + "/" + prefix + "InspectedTVX").data()) == nullptr) {
+    std::shared_ptr<TH1> inspectedTVX = histRegistry.add<TH1>((std::to_string(mRunNumber) + "/" + prefix + "InspectedTVX").data(), "", o2::framework::HistType::kTH1D, {{mInspectedTVX->GetNbinsX(), -0.5, static_cast<double>(mInspectedTVX->GetNbinsX() - 0.5)}});
+    for (int iBin{1}; iBin <= mInspectedTVX->GetNbinsX(); ++iBin) {
+      inspectedTVX->GetXaxis()->SetBinLabel(iBin, mInspectedTVX->GetXaxis()->GetBinLabel(iBin));
+      inspectedTVX->SetBinContent(iBin, mInspectedTVX->GetBinContent(iBin));
+      inspectedTVX->SetBinError(iBin, mInspectedTVX->GetBinError(iBin));
+    }
+  }
+}
+
 std::vector<int> Zorro::initCCDB(o2::ccdb::BasicCCDBManager* ccdb, int runNumber, uint64_t timestamp, std::string tois, int bcRange)
 {
   if (mRunNumber == runNumber) {
@@ -45,50 +78,61 @@ std::vector<int> Zorro::initCCDB(o2::ccdb::BasicCCDBManager* ccdb, int runNumber
   mLastSelectedIdx = 0;
   mTOIs.clear();
   mTOIidx.clear();
-  size_t pos = 0;
-  while ((pos = tois.find(",")) != std::string::npos) {
+  while (!tois.empty()) {
+    size_t pos = tois.find(",");
+    pos = (pos == std::string::npos) ? tois.size() : pos;
     std::string token = tois.substr(0, pos);
     // Trim leading and trailing whitespaces from the token
     token.erase(0, token.find_first_not_of(" "));
     token.erase(token.find_last_not_of(" ") + 1);
     int bin = mScalers->GetXaxis()->FindBin(token.c_str()) - 2;
     mTOIs.push_back(token);
     mTOIidx.push_back(bin);
-    tois.erase(0, pos + 1);
+    tois = tois.erase(0, pos + 1);
   }
   mTOIcounts.resize(mTOIs.size(), 0);
   return mTOIidx;
 }
 
 std::bitset<128> Zorro::fetch(uint64_t bcGlobalId, uint64_t tolerance)
 {
-  std::bitset<128> result;
+  mLastResult.reset();
   o2::dataformats::IRFrame bcFrame{InteractionRecord::long2IR(bcGlobalId) - tolerance, InteractionRecord::long2IR(bcGlobalId) + tolerance};
   if (bcGlobalId < mLastBCglobalId) {
     mLastSelectedIdx = 0;
   }
+  mLastBCglobalId = bcGlobalId;
   for (size_t i = mLastSelectedIdx; i < mBCranges.size(); i++) {
-    if (!bcFrame.getOverlap(mBCranges[i]).isZeroLength()) {
+    if (!mBCranges[i].isOutside(bcFrame)) {
       for (int iMask{0}; iMask < 2; ++iMask) {
         for (int iTOI{0}; iTOI < 64; ++iTOI) {
-          result.set(iMask * 64 + iTOI, mZorroHelpers->at(i).selMask[iMask] & (1ull << iTOI));
+          if (mZorroHelpers->at(i).selMask[iMask] & (1ull << iTOI)) {
+            mLastResult.set(iMask * 64 + iTOI, 1);
+            if (mAnalysedTriggers) {
+              mAnalysedTriggers->Fill(iMask * 64 + iTOI);
+            }
+          }
         }
       }
       mLastSelectedIdx = i;
-      return result;
+      return mLastResult;
+    } else if (mBCranges[i].getMax() < bcFrame.getMin()) {
+      mLastSelectedIdx = i;
+    } else if (mBCranges[i].getMin() > bcFrame.getMax()) {
+      break;
     }
   }
-  return result;
+  return mLastResult;
 }
 
 bool Zorro::isSelected(uint64_t bcGlobalId, uint64_t tolerance)
 {
   uint64_t lastSelectedIdx = mLastSelectedIdx;
-  std::bitset<128> result = fetch(bcGlobalId, tolerance);
+  fetch(bcGlobalId, tolerance);
   for (size_t i{0}; i < mTOIidx.size(); ++i) {
     if (mTOIidx[i] < 0) {
       continue;
-    } else if (result.test(mTOIidx[i])) {
+    } else if (mLastResult.test(mTOIidx[i])) {
       mTOIcounts[i] += (lastSelectedIdx != mLastSelectedIdx); /// Avoid double counting
       return true;
     }

EventFiltering/Zorro.h

@@ -18,9 +18,10 @@
 #include <string>
 #include <vector>
 
+#include "TH1D.h"
 #include "CommonDataFormat/IRFrame.h"
+#include "Framework/HistogramRegistry.h"
 
-class TH1D;
 namespace o2
 {
 namespace ccdb
@@ -42,6 +43,12 @@ class Zorro
   std::bitset<128> fetch(uint64_t bcGlobalId, uint64_t tolerance = 100);
   bool isSelected(uint64_t bcGlobalId, uint64_t tolerance = 100);
 
+  void populateHistRegistry(o2::framework::HistogramRegistry& histRegistry, std::string prefix = "");
+
+  TH1D* getScalers() const { return mScalers; }
+  TH1D* getSelections() const { return mSelections; }
+  TH1D* getInspectedTVX() const { return mInspectedTVX; }
+  std::bitset<128> getLastResult() const { return mLastResult; }
   std::vector<int> getTOIcounters() const { return mTOIcounts; }
 
   void setCCDBpath(std::string path) { mBaseCCDBPath = path; }
@@ -57,6 +64,8 @@ class Zorro
   TH1D* mScalers = nullptr;
   TH1D* mSelections = nullptr;
   TH1D* mInspectedTVX = nullptr;
+  std::shared_ptr<TH1> mAnalysedTriggers;
+  std::bitset<128> mLastResult;
   std::vector<o2::dataformats::IRFrame> mBCranges;
   std::vector<ZorroHelper>* mZorroHelpers = nullptr;
   std::vector<std::string> mTOIs;

PWGHF/HFC/Tasks/taskCorrelationDplusHadrons.cxx

@@ -150,8 +150,8 @@ struct HfTaskCorrelationDplusHadrons {
     // Histograms for data analysis
     registry.add("hBdtScorePrompt", "D+ BDT prompt score", {HistType::kTH1F, {axisBdtScore}});
     registry.add("hBdtScoreBkg", "D+ BDT bkg score", {HistType::kTH1F, {axisBdtScore}});
+    registry.add("hMassDplusVsPt", "D+ candidates massVsPt", {HistType::kTH2F, {{axisMassD}, {axisPtD}}});
     if (fillHistoData) {
-      registry.add("hMassDplusVsPt", "D+ candidates massVsPt", {HistType::kTH2F, {{axisMassD}, {axisPtD}}});
       registry.add("hDeltaEtaPtIntSignalRegion", stringDHadron + stringSignal + stringDeltaEta + "entries", {HistType::kTH1F, {axisDeltaEta}});
       registry.add("hDeltaPhiPtIntSignalRegion", stringDHadron + stringSignal + stringDeltaPhi + "entries", {HistType::kTH1F, {axisDeltaPhi}});
       registry.add("hCorrel2DPtIntSignalRegion", stringDHadron + stringSignal + stringDeltaPhi + stringDeltaEta + "entries", {HistType::kTH2F, {{axisDeltaPhi}, {axisDeltaEta}}});