Skip to content

[PWGCF] DptDpt - Filter and skimming framework fix linter issues #18702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
victor-gonzalez wants to merge 3 commits into
base: master
Choose a base branch
from
+1,325 −1,348
Open

[PWGCF] DptDpt - Filter and skimming framework fix linter issues #18702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6376e54
[PWGCF] DptDpt - Filter and skimming framework fix linter issues
Nov 11, 2026
0abad0c
[PWGCF] DptDpt - Filter and skimming framework fix MegaLinter issues
Nov 12, 2026
7c9e4ac
[PWGCF] DptDpt - Filter and skimming framework fix MegaLinter issues
Nov 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 72 additions & 75 deletions PWGCF/TwoParticleCorrelations/Core/EventSelectionFilterAndAnalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

/// \file EventSelectionFilterAndAnalysis.cxx
/// \brief Implementation of the EventSelectionFilterAndAnalysis class for
/// filtering collisions for derived data production
/// \author victor.gonzalez.sebastian@gmail.com

#include "EventSelectionFilterAndAnalysis.h"

#include "PWGCF/TwoParticleCorrelations/Core/SelectionFilterAndAnalysis.h"
Expand All @@ -35,55 +40,49 @@
#include <vector>

using namespace o2;
using namespace o2::analysis::PWGCF;
using namespace o2::analysis::pwgcf;
using namespace boost;

EventSelectionConfigurable::EventSelectionConfigurable(const std::vector<std::string>& bfieldsel,
std::vector<std::string> multsel,
std::vector<std::string> trigsel,
std::vector<std::string> zvtxsel,
std::vector<std::string> pileuprej)
: mBFiledSel(""),
mMultSel(""),
mTriggerSel(""),
mZVertexSel(""),
mPileUpRejection("")

{
auto storeCutString = [](auto& selvector, const std::string& selname) {
if (selvector.size() != 0) {
if (selvector.size() == 1) {
if (selvector[0].size() != 0) {
return TString::Format("%s{%s}", selname.c_str(), selvector[0].c_str());
} else {
return TString("");
}
} else {
TString scut = selname + "{cwv{";
bool def = true;
bool firstvar = true;
for (const auto& cut : selvector) {
if (def) {
scut += cut + ':';
def = false;
} else {
if (not firstvar) {
scut += ',';
}
scut += cut;
firstvar = false;
return TString("");
}
TString scut = selname + "{cwv{";
bool def = true;
bool firstvar = true;
for (const auto& cut : selvector) {
if (def) {
scut += cut + ':';
def = false;
} else {
if (not firstvar) {
scut += ',';
}
scut += cut;
firstvar = false;
}
scut += "}}";
return scut;
}
scut += "}}";
return scut;
}
return TString("");
};
/* b-field is a bit specific */
{
TString bfield = "bfield{";
bool first = true;
for (auto& pol : bfieldsel) {
for (const auto& pol : bfieldsel) {
if (not first) {
bfield += ',';
}
Expand All @@ -108,41 +107,40 @@ const char* multiplicityCorrelators[nNoOfPileUpCorrelators] = {"V0M_TPCOUT", "V0

/// \brief Default constructor
EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis()
: SelectionFilterAndAnalysis(),
mBFieldSelection{},
mMultiplicityClasses(nullptr),
: mMultiplicityClasses(nullptr),
mTriggerSelection(nullptr),
mZVertex(nullptr),
mPileUpRejection(nullptr)
{
}

/// \brief Constructor from regular expression
EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis(const TString& cutstr, selmodes mode)
EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis(const TString& cutstr, Selmodes mode)
: SelectionFilterAndAnalysis("", mode),
mBFieldSelection{},

mMultiplicityClasses(nullptr),
mTriggerSelection(nullptr),
mZVertex(nullptr),
mPileUpRejection(nullptr)
{
ConstructCutFromString(cutstr);
constructCutFromString(cutstr);
}

/// \brief Constructor from the event selection configurable
EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis(const EventSelectionConfigurable& evtsel, selmodes mode)
EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis(const EventSelectionConfigurable& evtsel, Selmodes mode)
: SelectionFilterAndAnalysis("", mode),
mBFieldSelection{},

mMultiplicityClasses(nullptr),
mTriggerSelection(nullptr),
mZVertex(nullptr),
mPileUpRejection(nullptr)
{
TString cutString = "eventsel{";
bool first = true;
constexpr int MaskMaxLength = 64;

auto appendCut = [&cutString, &first](const std::string& str) {
if (str.size() > 0) {
if (!str.empty()) {
if (first) {
cutString += str;
first = false;
Expand All @@ -158,29 +156,29 @@ EventSelectionFilterAndAnalysis::EventSelectionFilterAndAnalysis(const EventSele
appendCut(evtsel.mPileUpRejection);

cutString += "}";
ConstructCutFromString(cutString);
if (mMaskLength > 64) {
LOGF(fatal, "EventSelectionFilterAndAnalysis not ready for filter mask of %d bits. Just 64 available for the time being", mMaskLength);
constructCutFromString(cutString);
if (mMaskLength > MaskMaxLength) {
LOGF(fatal, "EventSelectionFilterAndAnalysis not ready for filter mask of %d bits. Just %d available for the time being", mMaskLength, MaskMaxLength);
}
mCutStringSignature = cutString.ReplaceAll("-yes", "").ReplaceAll("-no", "");
if (mode == kAnalysis) {
StoreArmedMask();
if (mode == KAnalysis) {
storeArmedMask();
}
}

/// \brief Calculates the length of the mask needed to store the selection cuts
int EventSelectionFilterAndAnalysis::CalculateMaskLength()
int EventSelectionFilterAndAnalysis::calculateMaskLength()
{
int length = 0;
auto addLength = [&length](auto& brick) {
if (brick != nullptr) {
length += brick->Length();
LOGF(info, "EventSelectionFilterAndAnalysis::CalculateMaskLength, cumulated length: %d", length);
length += brick->length();
LOGF(info, "EventSelectionFilterAndAnalysis::calculateMaskLength, cumulated length: %d", length);
}
};

for (auto brick : mBFieldSelection) {
length += brick->Length();
for (const auto& brick : mBFieldSelection) {
length += brick->length();
}
addLength(mMultiplicityClasses);
addLength(mTriggerSelection);
Expand Down Expand Up @@ -240,7 +238,7 @@ void EventSelectionFilterAndAnalysis::MultiplicityBrick::initialize()
}
}
}
if (mAlternateEstimatorIndex.size() != (uint)(varlst.GetEntries())) {
if (mAlternateEstimatorIndex.size() != static_cast<uint>(varlst.GetEntries())) {
LOGF(fatal, "EventSelectionFilterAndAnalysis::InitializeMultiplicityFilter() variant multiplicity class estimators not all implemented");
}
}
Expand Down Expand Up @@ -297,13 +295,13 @@ void EventSelectionFilterAndAnalysis::PileUpRejBrick::initialize()
}
}
}
if (mAlternateEstimatorIndex.size() != (uint)(varlst.GetEntries())) {
if (mAlternateEstimatorIndex.size() != static_cast<uint>(varlst.GetEntries())) {
LOGF(fatal, "EventSelectionFilterAndAnalysis::InitializeMultiplicityFilter() variant pile-up correlator estimators not all implemented");
}
}
}

void EventSelectionFilterAndAnalysis::ConstructCutFromString(const TString& cutstr)
void EventSelectionFilterAndAnalysis::constructCutFromString(const TString& cutstr)
{
LOGF(info, "Cut string: %s", cutstr.Data());
/* let's catch the first level */
Expand All @@ -312,8 +310,9 @@ void EventSelectionFilterAndAnalysis::ConstructCutFromString(const TString& cuts
smatch m;

bool res = regex_search(in, m, cutregex);
if (not res or m.empty() or (m.size() > 2)) {
LOGF(fatal, "EventSelectionFilterAndAnalysis::ConstructCutFromString", "Wrong RE: %s, try eventsel{bfield{positive-yes,negative-yes},zvtx{cwv{rg{-7.0,7.0}-yes:rg{-10.0,10.0}-no,rg{-3.0,3.0}-no}}} for instance", cutstr.Data());
constexpr int ExpectedMaxLength = 2;
if (not res || m.empty() || (m.size() > ExpectedMaxLength)) {
LOGF(fatal, "EventSelectionFilterAndAnalysis::constructCutFromString", "Wrong RE: %s, try eventsel{bfield{positive-yes,negative-yes},zvtx{cwv{rg{-7.0,7.0}-yes:rg{-10.0,10.0}-no,rg{-3.0,3.0}-no}}} for instance", cutstr.Data());
}
this->SetName("EventSelectionFilterAndAnalysisCuts");
this->SetTitle(cutstr.Data());
Expand All @@ -330,25 +329,23 @@ void EventSelectionFilterAndAnalysis::ConstructCutFromString(const TString& cuts
if (lev2str.Length() == 0) {
break;
}
regex cutregex("^(\\w+)\\{((?:[^{}]++|\\{(?2)\\})*)\\}");
std::string in(lev2str.Data());
smatch m;
bool res = regex_search(in, m, cutregex);
cutregex = regex("^(\\w+)\\{((?:[^{}]++|\\{(?2)\\})*)\\}");
in = (lev2str.Data());
res = regex_search(in, m, cutregex);
constexpr int ExpectedComponents = 3;

if (not res or m.empty() or (m.size() != 3)) {
Fatal("EventSelectionFilterAndAnalysis::::ConstructCutFromString", "Wrong RE: %s, try tracksel{ttype{FB32,FB96};nclstpc{th{70}},nxr{cwv{th{70},th{80}}}} for instance", cutstr.Data());
if (not res or m.empty() or (m.size() != ExpectedComponents)) {
Fatal("EventSelectionFilterAndAnalysis::::constructCutFromString", "Wrong RE: %s, try tracksel{ttype{FB32,FB96};nclstpc{th{70}},nxr{cwv{th{70},th{80}}}} for instance", cutstr.Data());
}
LOGF(info, "Captured %s", m[1].str().c_str());
auto storeIntCut = [&m, &allowed](CutBrick<int>*& brickvar) {
if (brickvar != nullptr) {
delete brickvar;
}
delete brickvar;

brickvar = CutBrick<int>::constructBrick(m[1].str().c_str(), m[2].str().c_str(), allowed);
};
auto storeFloatCut = [&m, &allowed](CutBrick<float>*& brickvar) {
if (brickvar != nullptr) {
delete brickvar;
}
delete brickvar;

brickvar = CutBrick<float>::constructBrick(m[1].str().c_str(), m[2].str().c_str(), allowed);
};
/* b-field requires speciat treatment */
Expand All @@ -358,7 +355,7 @@ void EventSelectionFilterAndAnalysis::ConstructCutFromString(const TString& cuts
auto addBFieldBrick = [&brickvector](auto name, auto regex, bool arm) {
std::set<std::string> allowed = {"lim", "th"};
CutBrick<float>* brick = CutBrick<float>::constructBrick(name, regex, allowed);
brick->Arm(arm);
brick->arm(arm);
brickvector.push_back(brick);
};
if (TString(regex).Contains("positive")) {
Expand Down Expand Up @@ -394,15 +391,15 @@ void EventSelectionFilterAndAnalysis::ConstructCutFromString(const TString& cuts
lev2str.Remove(0, m[0].length());
}
}
mMaskLength = CalculateMaskLength();
mMaskLength = calculateMaskLength();
}

///
void EventSelectionFilterAndAnalysis::ComplexBrickHelper::armedBrick(uint64_t& armedmask, uint64_t& optmask, uint64_t& forcedmask, int& bit)
{
auto armedBrick = [&](auto brick, bool opt = false) {
std::vector<bool> res = brick->IsArmed();
for (auto b : res) {
std::vector<bool> res = brick->isArmed();
for (const auto& b : res) {
if (b) {
SETBIT(armedmask, bit);
if (opt) {
Expand All @@ -415,21 +412,21 @@ void EventSelectionFilterAndAnalysis::ComplexBrickHelper::armedBrick(uint64_t& a
}
};

if (mAlternateEstimatorIndex.size() > 0) {
if (!mAlternateEstimatorIndex.empty()) {
/* we have alternative estimators so our brick is of kind cwv */
if (mBrick->IsA() != CutWithVariations<float>::Class()) {
LOGF(fatal, "EventSelectionFilterAndAnalysis::Filter() expected class with variations cut but it is not there");
LOGF(fatal, "EventSelectionFilterAndAnalysis::filter() expected class with variations cut but it is not there");
}
/* first the default */
TList& deflst = dynamic_cast<CutWithVariations<float>*>(mBrick)->getDefaultBricks();
if (deflst.GetEntries() > 1) {
LOGF(fatal, "EventSelectionFilterAndAnalysis::Filter() expected only one default multiplicity class estimator");
LOGF(fatal, "EventSelectionFilterAndAnalysis::filter() expected only one default multiplicity class estimator");
}
armedBrick((CutBrick<float>*)deflst.At(0), true);
armedBrick(dynamic_cast<CutBrick<float>*>(deflst.At(0)), true);
/* and now the variants */
TList& varlst = dynamic_cast<CutWithVariations<float>*>(mBrick)->getVariantBricks();
for (int i = 0; i < varlst.GetEntries(); ++i) {
armedBrick((CutBrick<float>*)varlst.At(i), true);
armedBrick(dynamic_cast<CutBrick<float>*>(varlst.At(i)), true);
}
} else {
/* no alternative estimators, just the default */
Expand All @@ -438,7 +435,7 @@ void EventSelectionFilterAndAnalysis::ComplexBrickHelper::armedBrick(uint64_t& a
}

/// \brief Fills the filter cuts mask
void EventSelectionFilterAndAnalysis::StoreArmedMask()
void EventSelectionFilterAndAnalysis::storeArmedMask()
{
uint64_t armedMask = 0UL;
uint64_t optMask = 0UL;
Expand All @@ -449,8 +446,8 @@ void EventSelectionFilterAndAnalysis::StoreArmedMask()
int bit = 0;

auto armedBrick = [&](auto brick, bool opt = false) {
std::vector<bool> res = brick->IsArmed();
for (auto b : res) {
std::vector<bool> res = brick->isArmed();
for (const auto& b : res) {
if (b) {
SETBIT(armedMask, bit);
if (opt) {
Expand All @@ -464,7 +461,7 @@ void EventSelectionFilterAndAnalysis::StoreArmedMask()
};

optMask = 0UL;
for (auto brick : mBFieldSelection) {
for (const auto& brick : mBFieldSelection) {
armedBrick(brick, true);
}
mOptArmedMask.push_back(optMask);
Expand All @@ -480,7 +477,7 @@ void EventSelectionFilterAndAnalysis::StoreArmedMask()
if (mPileUpRejection != nullptr) {
mPileUpRejection->armedBrick(armedMask, optMask, forcedMask, bit);
}
LOGF(info, "EventSelectionFilterAndAnalysis::StoreArmedMask(), masks 0x%016lx, %s, 0x%016lx", armedMask, printOptionalMasks().Data(), forcedMask);
LOGF(info, "EventSelectionFilterAndAnalysis::storeArmedMask(), masks 0x%016lx, %s, 0x%016lx", armedMask, printOptionalMasks().Data(), forcedMask);
mArmedMask = armedMask;
mForcedArmedMask = forcedMask;
}
Loading
Loading