Skip to content

[PWGCF] Small fixes in femto framework #17275

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
ariedel-cern merged 1 commit into from
Jul 31, 2026
Merged

[PWGCF] Small fixes in femto framework #17275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions PWGCF/Femto/Core/pairHistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ struct ConfPairBinning : o2::framework::ConfigurableGroup {
o2::framework::ConfigurableAxis pt2{"pt2", {{100, 0, 6}}, "Pt binning for particle 2"};
o2::framework::ConfigurableAxis mass1{"mass1", {{100, 0, 2}}, "Mass binning for particle 1 (if particle has mass getter, otherwise PDG mass)"};
o2::framework::ConfigurableAxis mass2{"mass2", {{100, 0, 2}}, "Mass binning for particle 2 (if particle has mass getter, otherwise PDG mass)"};
o2::framework::ConfigurableAxis massInv{"massInv", {{100, 0, 2}}, "Invariant Mass binning"};
o2::framework::ConfigurableAxis massInv{"massInv", {{100, 0, 5}}, "Invariant Mass binning"};
o2::framework::ConfigurableAxis dalitzMtot{"dalitzMtot", {{100, 0, 10}}, "Total invariant mass squared binning in darlitz plot"};
o2::framework::ConfigurableAxis dalitzM12{"dalitzM12", {{100, 0, 10}}, "Mass12 binning of darlitz plot"};
o2::framework::ConfigurableAxis dalitzM13{"dalitzM13", {{100, 0, 10}}, "Mass13 binning of darlitz plot"};
Expand Down Expand Up @@ -705,7 +705,9 @@ class PairHistManager
}

if (mPlotDalitz) {
if constexpr (modes::isEqual(particleType1, modes::Particle::kTrack) && (modes::isEqual(particleType2, modes::Particle::kV0) || modes::isEqual(particleType2, modes::Particle::kCharmHadron))) {
if constexpr (modes::isEqual(particleType1, modes::Particle::kTrack) && (modes::isEqual(particleType2, modes::Particle::kV0) ||
modes::isEqual(particleType2, modes::Particle::kTwoTrackResonance) ||
modes::isEqual(particleType2, modes::Particle::kCharmHadron))) {
auto posDaughter = trackTable.rawIteratorAt(particle2.posDauId() - trackTable.offset());
auto negDaughter = trackTable.rawIteratorAt(particle2.negDauId() - trackTable.offset());
ROOT::Math::PtEtaPhiMVector posDau4v = ROOT::Math::PtEtaPhiMVector(posDaughter.pt(), posDaughter.eta(), posDaughter.phi(), mPdgMassPosDau2);
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Tasks/femtoPairMcParticleMcParticle.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ struct FemtoPairMcParticleMcParticle {
{
// setup columnpolicy for binning
// default values are used during instantiation, so we need to explicity update them here
mixBinsVtxMult = {{confMixing.vtxBins, confMixing.multBins.value}, true};
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};

Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Tasks/femtoPairTrackCascade.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ struct FemtoPairTrackCascade {

// setup columnpolicy for binning
// default values are used during instantiation, so we need to explicity update them here
mixBinsVtxMult = {{confMixing.vtxBins, confMixing.multBins.value}, true};
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};

Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Tasks/femtoPairTrackKink.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ struct FemtoPairTrackKink {

// setup columnpolicy for binning
// default values are used during instantiation, so we need to explicity update them here
mixBinsVtxMult = {{confMixing.vtxBins, confMixing.multBins.value}, true};
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};

Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Tasks/femtoPairTrackTrack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ struct FemtoPairTrackTrack {

// setup columnpolicy for binning
// default values are used during instantiation, so we need to explicity update them here
mixBinsVtxMult = {{confMixing.vtxBins, confMixing.multBins.value}, true};
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};

Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Tasks/femtoPairTrackV0.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ struct FemtoPairTrackV0 {

// setup columnpolicy for binning
// default values are used during instantiation, so we need to explicity update them here
mixBinsVtxMult = {{confMixing.vtxBins, confMixing.multBins.value}, true};
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};

Expand Down
4 changes: 2 additions & 2 deletions PWGCF/Femto/Tasks/femtoTrackQa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ struct FemtoTrackQa {
if ((static_cast<int>(doprocessData) + static_cast<int>(doprocessMc)) > 1) {
LOG(fatal) << "More than 1 process function is activated. Breaking...";
}
bool processData = doprocessData;
bool processDataFlag = doprocessData;
trackCleaner.init(confTrackCleaner);

std::map<colhistmanager::ColHist, std::vector<o2::framework::AxisSpec>> colHistSpec;
std::map<trackhistmanager::TrackHist, std::vector<o2::framework::AxisSpec>> trackHistSpec;

if (processData) {
if (processDataFlag) {
colHistSpec = colhistmanager::makeColQaHistSpecMap(confCollisionBinning, confCollisionQaBinning);
colHistManager.init<modes::Mode::kReco_Qa>(&hRegistry, colHistSpec, confCollisionBinning, confCollisionQaBinning);
trackHistSpec = trackhistmanager::makeTrackQaHistSpecMap(confTrackBinning, confTrackQaBinning);
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Tasks/femtoTripletTrackTrackCascade.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ struct FemtoTripletTrackTrackCascade {
}
// setup columnpolicy for binning
// default values are used during instantiation, so we need to explicity update them here
mixBinsVtxMult = {{confMixing.vtxBins, confMixing.multBins.value}, true};
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};

Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Tasks/femtoTripletTrackTrackTrack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ struct FemtoTripletTrackTrackTrack {

// setup columnpolicy for binning
// default values are used during instantiation, so we need to explicity update them here
mixBinsVtxMult = {{confMixing.vtxBins, confMixing.multBins.value}, true};
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};

Expand Down
Loading