Skip to content

[PWGEM] Store the mixing categories if flag is true #18111

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
mhemmer-cern merged 5 commits into from
Oct 5, 2026
+52 −9
Merged

[PWGEM] Store the mixing categories if flag is true #18111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
272ec9b
Store the mixing categories if flag is true
Sep 29, 2026
8b01763
changed as suggested
Oct 2, 2026
913ffc9
fixing errors
Oct 5, 2026
00fe713
fixing errors
Oct 5, 2026
9fc2ed6
Please consider the following formatting changes
Oct 5, 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
40 changes: 33 additions & 7 deletions PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ struct Pi0EtaToGammaGamma {
o2::framework::ConfigurableAxis ConfCentBins{"ConfCentBins", {o2::framework::VARIABLE_WIDTH, 0.0f, 5.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f, 100.f, 999.f}, "Mixing bins - centrality"};
o2::framework::ConfigurableAxis ConfEPBins{"ConfEPBins", {o2::framework::VARIABLE_WIDTH, -o2::constants::math::PIHalf, -o2::constants::math::PIQuarter, 0.0f, +o2::constants::math::PIQuarter, +o2::constants::math::PIHalf}, "Mixing bins - event plane angle"};
o2::framework::ConfigurableAxis ConfOccupancyBins{"ConfOccupancyBins", {o2::framework::VARIABLE_WIDTH, -1, 1e+10}, "Mixing bins - occupancy"};
o2::framework::Configurable<bool> cfgSparseFullAxes{"cfgSparseFullAxes", false, "add event plane, occupancy and z-vertex axes to Pair/same/hs and Pair/mix/hs"};

o2::framework::Configurable<int> cfgAlphaMesonCut{"cfgAlphaMesonCut", 0, "flag for photon energy asymmetry distribution cut: 0: no cut, 1: cut specific value, 2: cut depending on pT"};
o2::framework::Configurable<float> cfgAlphaMeson{"cfgAlphaMeson", 0.65, "photon energy asymmetry distribution parameter for specific value cut"};
Expand Down Expand Up @@ -423,10 +424,13 @@ struct Pi0EtaToGammaGamma {
emh2 = new o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, o2::aod::pwgem::photonmeson::utils::EMPhoton>(ndepth);

o2::aod::pwgem::photonmeson::utils::eventhistogram::addEventHistograms(&fRegistry);
std::vector<double> occBinsForHs(occ_bin_edges.begin(), occ_bin_edges.end());
std::vector<double> epBinsForHs(ep_bin_edges.begin(), ep_bin_edges.end());
std::vector<double> vtxBinsForHs(zvtx_bin_edges.begin(), zvtx_bin_edges.end());
if constexpr (pairtype == o2::aod::pwgem::photonmeson::photonpair::PairType::kPCMDalitzEE) {
o2::aod::pwgem::photonmeson::utils::nmhistogram::addNMHistograms(&fRegistry, false, "ee#gamma");
o2::aod::pwgem::photonmeson::utils::nmhistogram::addNMHistograms(&fRegistry, false, cfgSparseFullAxes.value, occBinsForHs, epBinsForHs, vtxBinsForHs, "ee#gamma");
} else {
o2::aod::pwgem::photonmeson::utils::nmhistogram::addNMHistograms(&fRegistry, false, "#gamma#gamma");
o2::aod::pwgem::photonmeson::utils::nmhistogram::addNMHistograms(&fRegistry, false, cfgSparseFullAxes.value, occBinsForHs, epBinsForHs, vtxBinsForHs, "#gamma#gamma");
}
DefineEMEventCut();
DefinePCMCut();
Expand Down Expand Up @@ -800,6 +804,8 @@ struct Pi0EtaToGammaGamma {
occbin = static_cast<int>(occ_bin_edges.size()) - 2;
}

float occupancy = (cfgOccupancyEstimator == 1) ? static_cast<float>(collision.trackOccupancyInTimeRange()) : collision.ft0cOccupancyInTimeRange();

// LOGF(info, "collision.globalIndex() = %d, collision.posZ() = %f, centrality = %f, ep2 = %f, collision.trackOccupancyInTimeRange() = %d, zbin = %d, centbin = %d, epbin = %d, occbin = %d", collision.globalIndex(), collision.posZ(), centrality, ep2, collision.trackOccupancyInTimeRange(), zbin, centbin, epbin, occbin);

std::tuple<int, int, int, int> key_bin = std::make_tuple(zbin, centbin, epbin, occbin);
Expand Down Expand Up @@ -859,7 +865,11 @@ struct Pi0EtaToGammaGamma {
continue;
}

fRegistry.fill(HIST("Pair/same/hs"), veeg.M(), veeg.Pt(), weight);
if (cfgSparseFullAxes.value) {
fRegistry.fill(HIST("Pair/same/hs"), veeg.M(), veeg.Pt(), ep2, occupancy, collision.posZ(), weight);
} else {
fRegistry.fill(HIST("Pair/same/hs"), veeg.M(), veeg.Pt(), weight);
}

std::pair<int, int> tuple_tmp_id2 = std::make_pair(pos2.trackId(), ele2.trackId());
if (std::find(used_photonIds_per_col.begin(), used_photonIds_per_col.end(), g1.globalIndex()) == used_photonIds_per_col.end()) {
Expand Down Expand Up @@ -953,7 +963,11 @@ struct Pi0EtaToGammaGamma {
wpair *= g2.omegaMBWeight();
}

fRegistry.fill(HIST("Pair/same/hs"), v12.M(), v12.Pt(), wpair);
if (cfgSparseFullAxes.value) {
fRegistry.fill(HIST("Pair/same/hs"), v12.M(), v12.Pt(), ep2, occupancy, collision.posZ(), wpair);
} else {
fRegistry.fill(HIST("Pair/same/hs"), v12.M(), v12.Pt(), wpair);
}

if (std::find(used_photonIds_per_col.begin(), used_photonIds_per_col.end(), g1.globalIndex()) == used_photonIds_per_col.end()) {
auto emphoton1 = o2::aod::pwgem::photonmeson::utils::EMPhoton(g1.pt(), g1.eta(), g1.phi(), 0);
Expand Down Expand Up @@ -1047,7 +1061,11 @@ struct Pi0EtaToGammaGamma {
continue;
}

fRegistry.fill(HIST("Pair/mix/hs"), v12.M(), v12.Pt(), weight);
if (cfgSparseFullAxes.value) {
fRegistry.fill(HIST("Pair/mix/hs"), v12.M(), v12.Pt(), ep2, occupancy, collision.posZ(), weight);
} else {
fRegistry.fill(HIST("Pair/mix/hs"), v12.M(), v12.Pt(), weight);
}
}
}
} // end of loop over mixed event pool
Expand Down Expand Up @@ -1082,7 +1100,11 @@ struct Pi0EtaToGammaGamma {
if (std::fabs(v12.Rapidity()) > maxY) {
continue;
}
fRegistry.fill(HIST("Pair/mix/hs"), v12.M(), v12.Pt(), weight);
if (cfgSparseFullAxes.value) {
fRegistry.fill(HIST("Pair/mix/hs"), v12.M(), v12.Pt(), ep2, occupancy, collision.posZ(), weight);
} else {
fRegistry.fill(HIST("Pair/mix/hs"), v12.M(), v12.Pt(), weight);
}
}
}
} // end of loop over mixed event pool
Expand Down Expand Up @@ -1115,7 +1137,11 @@ struct Pi0EtaToGammaGamma {
if (std::fabs(v12.Rapidity()) > maxY) {
continue;
}
fRegistry.fill(HIST("Pair/mix/hs"), v12.M(), v12.Pt(), weight);
if (cfgSparseFullAxes.value) {
fRegistry.fill(HIST("Pair/mix/hs"), v12.M(), v12.Pt(), ep2, occupancy, collision.posZ(), weight);
} else {
fRegistry.fill(HIST("Pair/mix/hs"), v12.M(), v12.Pt(), weight);
}
}
}
} // end of loop over mixed event pool
Expand Down
21 changes: 19 additions & 2 deletions PWGEM/PhotonMeson/Utils/NMHistograms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include "PWGEM/PhotonMeson/Utils/MCUtilities.h"

#include <CommonConstants/MathConstants.h>
#include <CommonConstants/PhysicsConstants.h>
#include <Framework/Concepts.h>
#include <Framework/HistogramRegistry.h>
Expand All @@ -32,7 +33,12 @@

namespace o2::aod::pwgem::photonmeson::utils::nmhistogram
{
inline void addNMHistograms(o2::framework::HistogramRegistry* fRegistry, bool isMC, const char* pairname = "#gamma#gamma")
inline void addNMHistograms(o2::framework::HistogramRegistry* fRegistry, bool isMC,
bool sparseFullAxes = false,
std::vector<double> const& occBins = {0, 500, 1000, 2000, 3000, 5000, 10000},
std::vector<double> const& epBins = {-o2::constants::math::PIHalf, -o2::constants::math::PIQuarter, 0, o2::constants::math::PIQuarter, o2::constants::math::PIHalf},
std::vector<double> const& vtxBins = {-10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10},
const char* pairname = "#gamma#gamma")
{
// !!Don't change pt,eta,y binning. These binnings have to be consistent with binned data at skimming.!!
std::vector<double> ptbins;
Expand All @@ -51,6 +57,9 @@ inline void addNMHistograms(o2::framework::HistogramRegistry* fRegistry, bool is
}
const o2::framework::AxisSpec axis_pt{ptbins, Form("p_{T,%s} (GeV/c)", pairname)};
const o2::framework::AxisSpec axis_mass{400, 0, 0.8, Form("m_{%s} (GeV/c^{2})", pairname)};
const o2::framework::AxisSpec axis_occ{occBins, "occupancy"};
const o2::framework::AxisSpec axis_ep{epBins, "#Psi_{2} (rad)"};
const o2::framework::AxisSpec axis_vtx{vtxBins, "Z_{vtx} (cm)"};

if (isMC) {
fRegistry->add("Pair/Pi0/hs_Primary", "rec. true pi0", o2::framework::HistType::kTHnSparseD, {axis_mass, axis_pt}, true);
Expand All @@ -74,7 +83,15 @@ inline void addNMHistograms(o2::framework::HistogramRegistry* fRegistry, bool is
fRegistry->get<TH2>(HIST("Generated/Eta/hPtY"))->SetXTitle("p_{T} (GeV/c)");
fRegistry->get<TH2>(HIST("Generated/Eta/hPtY"))->SetYTitle("rapidity |y|");
} else {
fRegistry->add("Pair/same/hs", "diphoton", o2::framework::HistType::kTHnSparseD, {axis_mass, axis_pt}, true);
if (sparseFullAxes) {
fRegistry->add("Pair/same/hs", "diphoton",
o2::framework::HistType::kTHnSparseD,
{axis_mass, axis_pt, axis_ep, axis_occ, axis_vtx}, true);
} else {
fRegistry->add("Pair/same/hs", "diphoton",
o2::framework::HistType::kTHnSparseD,
{axis_mass, axis_pt}, true);
}
fRegistry->addClone("Pair/same/", "Pair/mix/");
}
}
Expand Down
Loading