Skip to content

[PWGCF] Improvements on efficiency correction #18120

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

Merged
abilandz merged 2 commits into from
Oct 1, 2026
+40 −30
Merged

[PWGCF] Improvements on efficiency correction #18120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27b9ed5
Improvements on efficiency correction
Sep 30, 2026
33c32ba
Add run message switch for logging run number and small bug fix
meiALICE Sep 30, 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
70 changes: 40 additions & 30 deletions PWGCF/MultiparticleCorrelations/Tasks/multiparticleCorrelationsMei.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ enum EMiscHistograms {
eMiscHistograms_N
};

enum EExternalHistograms {
enum EWeightsHistograms {
ePhi = 0,
ePt,
eExternalHistograms_N
eWeightsHistograms_N
};

enum EObservables {
Expand All @@ -159,7 +159,7 @@ static constexpr std::array<const char*, eMultiplicityTables_N> MultiplicityTabl
"multFT0M",
"multNTracksPV"};

static constexpr std::array<const char*, eExternalHistograms_N> WeightsNames = {
static constexpr std::array<const char*, eWeightsHistograms_N> WeightsNames = {
"ePhi",
"ePt"};

Expand Down Expand Up @@ -187,7 +187,7 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to

// *) external root files
Configurable<bool> cfExternalFileSwitch{"cfExternalFileSwitch", false, "choose to include external root files or not"};
Configurable<std::string> cfFileWithWeights{"cfFileWithWeights", "/alice-ccdb.cern.ch/Users/m/mei/O2challenge-", "path to external ROOT file which holds all particle weights"};
Configurable<std::string> cfFileWithWeights{"cfFileWithWeights", "/alice-ccdb.cern.ch/Users/m/mei/thesis-", "path to external ROOT file which holds all particle weights"};

// *) binnings
Configurable<bool> cfALICECentBinSwitch{"cfALICECentBinSwitch", true, "switch on or off to use ALICE default binning"};
Expand Down Expand Up @@ -219,6 +219,7 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
// *) misc
Configurable<double> sigmaInel{"sigmaInel", 7.71, "inelastic cross section in mb"};
Configurable<bool> qualityAssuranceSwitch{"qualityAssuranceSwitch", false, "quality assurance switch"};
Configurable<bool> runMessageSwitch{"runMessageSwitch", false, "run message switch"};

// *) Define and initialize all data members to be called in the main process* functions:
// **) Task configuration:
Expand Down Expand Up @@ -247,7 +248,7 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
// *) External histograms:
struct ExternalHistograms {
TList* fExternalHistogramsList = nullptr;
std::array<std::array<TH1F*, eCuts_N>, eExternalHistograms_N> fWeights{}; //! [type][before, after cuts]
std::array<std::array<TH1F*, eCuts_N>, eWeightsHistograms_N> fWeights{}; //! [type][before, after cuts]
} ex;

struct Observables {
Expand Down Expand Up @@ -275,7 +276,7 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
}

template <typename T1>
void updateQVectorsTable(std::vector<std::vector<TComplex>>& QVectorsTable, T1 phi, T1 weight = T1(1))
void updateQVectorsTable(std::vector<std::vector<TComplex>>& QVectorsTable, T1 const& phi, T1 weight = T1(1))
{
const int maxHarmonic = QVectorsTable.size();
const int maxPower = QVectorsTable.empty() ? 0 : QVectorsTable[0].size();
Expand Down Expand Up @@ -526,9 +527,9 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to

// templates
template <typename T1>
float chooseCent(T1 const& collision)
float chooseCent(T1 const& collision, int const& whichEstimator)
{
switch (centralityEstimator) {
switch (whichEstimator) {
case eFT0C:
return static_cast<float>(collision.centFT0C());
case eFT0M:
Expand All @@ -544,9 +545,9 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
}

template <typename T1>
float chooseMult(T1 const& collision)
float chooseMult(T1 const& collision, int const& whichTable)
{
switch (multiplicityTables) {
switch (whichTable) {
case eMultTPC:
return static_cast<float>(collision.multTPC());
case eMultFV0M:
Expand Down Expand Up @@ -598,8 +599,8 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
if constexpr (rs == eRec || rs == eRecAndSim) {
// Fill reconstructed-level event histograms
if (rm == eReal) {
auto thisCent = chooseCent(collision);
auto thisRefMult = chooseMult(collision);
auto thisCent = chooseCent(collision, centralityEstimator);
auto thisRefMult = chooseMult(collision, multiplicityTables);
int multiplicityRec = static_cast<int>(tracks.size());
if constexpr (cuts == eBefore) {
ec.fEventHist[eHistMultiplicity][eRec][eBefore]->Fill(multiplicityRec);
Expand Down Expand Up @@ -772,10 +773,13 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to

void loadWeights(int runNumber)
{
for (int i = 0; i < eExternalHistograms_N; ++i) {
for (int i = 0; i < eWeightsHistograms_N; ++i) {
for (int j = 0; j < eCuts_N; ++j) {
ex.fWeights[i][j] =
getHistogramWithWeights(cfFileWithWeights.value.c_str(), Form("%d", runNumber), Form("[%s][%s]", WeightsNames[i], CutsNames[j]));
ex.fWeights[i][j] = getHistogramWithWeights(cfFileWithWeights.value.c_str(), Form("%d", runNumber), Form("[%s][%s]", WeightsNames[i], CutsNames[j]));
if (!ex.fWeights[i][j]) {
LOGF(info, "[%s][%s] not found", WeightsNames[i], CutsNames[j]);
continue;
}
ex.fExternalHistogramsList->Add(ex.fWeights[i][j]);
}
}
Expand All @@ -784,7 +788,7 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
template <ERecSim rs, typename T1>
void qaFill(T1 const& collision)
{
auto thisCent = chooseCent(collision);
auto thisCent = chooseCent(collision, centralityEstimator);
if constexpr (rs == eRecAndSim || rs == eSim) {
if (!collision.has_mcCollision()) {
return;
Expand All @@ -807,7 +811,10 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
if (tc.fDryRun) {
return;
}
int thisRunNumber = collision.bc().runNumber();
const int thisRunNumber = collision.bc().runNumber();
if (runMessageSwitch) {
LOGF(info, "Successfully running, run number is %d", thisRunNumber);
}

if (isFirstCollision) {
// Get run number
Expand Down Expand Up @@ -848,27 +855,30 @@ struct MultiparticleCorrelationsMei // this name is used in lower-case format to
auto track = tracks.iteratorAt(0); // set the type and scope from one instance
for (int64_t i = 0; i < tracks.size(); i++) {
track = tracks.iteratorAt(i);
const float thisPhi = track.phi();
const float thisPt = track.pt();
float wPhiBefore = 1.f;
float wPhiAfter = 1.f;
float wPtBefore = 1.f;
float wPtAfter = 1.f;
if (cfExternalFileSwitch && ex.fWeights[ePhi][eBefore]) {
wPhiBefore = ex.fWeights[ePhi][eBefore]->GetBinContent(ex.fWeights[ePhi][eBefore]->FindBin(thisPhi));
wPhiAfter = ex.fWeights[ePhi][eAfter]->GetBinContent(ex.fWeights[ePhi][eAfter]->FindBin(thisPhi));
wPtBefore = ex.fWeights[ePt][eBefore]->GetBinContent(ex.fWeights[ePt][eBefore]->FindBin(thisPt));
wPtAfter = ex.fWeights[ePt][eAfter]->GetBinContent(ex.fWeights[ePt][eAfter]->FindBin(thisPt));
float thisPhi = track.phi();
float thisPt = track.pt();
std::array<float, 2> thisPhiAndPt = {thisPhi, thisPt};
std::array<std::array<float, 2>, 2> thisWeights = {{{1.f, 1.f}, {1.f, 1.f}}}; // {{wPhiBefore, wPhiAfter},{wPtBefore, wPtAfter}}

// eWeightsHistograms_N
if (cfExternalFileSwitch) {
for (int k = 0; k < eWeightsHistograms_N; ++k) {
for (int j = 0; j < eCuts_N; ++j) {
if (ex.fWeights[k][j]) {
thisWeights[k][j] = ex.fWeights[k][j]->GetBinContent(ex.fWeights[k][j]->FindBin(thisPhiAndPt[k]));
}
}
}
}

particleHistFill<rs, eReal, eBefore>(track);
particleHistFill<rs, eMC, eBefore>(track);
updateQVectorsTable(qVectorsTableBeforeCutsReal, thisPhi, wPhiBefore * wPtBefore);
updateQVectorsTable(qVectorsTableBeforeCutsReal, thisPhi, thisWeights[ePhi][eBefore] * thisWeights[ePt][eBefore]);

if (cfMasterCutSwitch) {
if (passesEventCutsReal && particleCuts<rs, eReal>(track)) {
particleHistFill<rs, eReal, eAfter>(track);
updateQVectorsTable(qVectorsTableAfterCutsReal, thisPhi, wPhiAfter * wPtAfter);
updateQVectorsTable(qVectorsTableAfterCutsReal, thisPhi, thisWeights[ePhi][eAfter] * thisWeights[ePt][eAfter]);
}
if (passesEventCutsMC && particleCuts<rs, eMC>(track)) {
particleHistFill<rs, eMC, eAfter>(track);
Expand Down
Loading