Skip to content

Commit a70296c

Browse files
ariedel-cernariedel-cern
authored
[PWGCF] Small fixes in femto framework (#17275)
1 parent 9c84039 commit a70296c

9 files changed

Lines changed: 13 additions & 11 deletions

‎PWGCF/Femto/Core/pairHistManager.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ struct ConfPairBinning : o2::framework::ConfigurableGroup {
216216
o2::framework::ConfigurableAxis pt2{"pt2", {{100, 0, 6}}, "Pt binning for particle 2"};
217217
o2::framework::ConfigurableAxis mass1{"mass1", {{100, 0, 2}}, "Mass binning for particle 1 (if particle has mass getter, otherwise PDG mass)"};
218218
o2::framework::ConfigurableAxis mass2{"mass2", {{100, 0, 2}}, "Mass binning for particle 2 (if particle has mass getter, otherwise PDG mass)"};
219-
o2::framework::ConfigurableAxis massInv{"massInv", {{100, 0, 2}}, "Invariant Mass binning"};
219+
o2::framework::ConfigurableAxis massInv{"massInv", {{100, 0, 5}}, "Invariant Mass binning"};
220220
o2::framework::ConfigurableAxis dalitzMtot{"dalitzMtot", {{100, 0, 10}}, "Total invariant mass squared binning in darlitz plot"};
221221
o2::framework::ConfigurableAxis dalitzM12{"dalitzM12", {{100, 0, 10}}, "Mass12 binning of darlitz plot"};
222222
o2::framework::ConfigurableAxis dalitzM13{"dalitzM13", {{100, 0, 10}}, "Mass13 binning of darlitz plot"};
@@ -705,7 +705,9 @@ class PairHistManager
705705
}
706706

707707
if (mPlotDalitz) {
708-
if constexpr (modes::isEqual(particleType1, modes::Particle::kTrack) && (modes::isEqual(particleType2, modes::Particle::kV0) || modes::isEqual(particleType2, modes::Particle::kCharmHadron))) {
708+
if constexpr (modes::isEqual(particleType1, modes::Particle::kTrack) && (modes::isEqual(particleType2, modes::Particle::kV0) ||
709+
modes::isEqual(particleType2, modes::Particle::kTwoTrackResonance) ||
710+
modes::isEqual(particleType2, modes::Particle::kCharmHadron))) {
709711
auto posDaughter = trackTable.rawIteratorAt(particle2.posDauId() - trackTable.offset());
710712
auto negDaughter = trackTable.rawIteratorAt(particle2.negDauId() - trackTable.offset());
711713
ROOT::Math::PtEtaPhiMVector posDau4v = ROOT::Math::PtEtaPhiMVector(posDaughter.pt(), posDaughter.eta(), posDaughter.phi(), mPdgMassPosDau2);

‎PWGCF/Femto/Tasks/femtoPairMcParticleMcParticle.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ struct FemtoPairMcParticleMcParticle {
107107
{
108108
// setup columnpolicy for binning
109109
// default values are used during instantiation, so we need to explicity update them here
110-
mixBinsVtxMult = {{confMixing.vtxBins, confMixing.multBins.value}, true};
110+
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
111111
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
112112
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};
113113

‎PWGCF/Femto/Tasks/femtoPairTrackCascade.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ struct FemtoPairTrackCascade {
177177

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

‎PWGCF/Femto/Tasks/femtoPairTrackKink.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ struct FemtoPairTrackKink {
167167

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

‎PWGCF/Femto/Tasks/femtoPairTrackTrack.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ struct FemtoPairTrackTrack {
129129

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

‎PWGCF/Femto/Tasks/femtoPairTrackV0.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ struct FemtoPairTrackV0 {
169169

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

‎PWGCF/Femto/Tasks/femtoTrackQa.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ struct FemtoTrackQa {
8686
if ((static_cast<int>(doprocessData) + static_cast<int>(doprocessMc)) > 1) {
8787
LOG(fatal) << "More than 1 process function is activated. Breaking...";
8888
}
89-
bool processData = doprocessData;
89+
bool processDataFlag = doprocessData;
9090
trackCleaner.init(confTrackCleaner);
9191

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

95-
if (processData) {
95+
if (processDataFlag) {
9696
colHistSpec = colhistmanager::makeColQaHistSpecMap(confCollisionBinning, confCollisionQaBinning);
9797
colHistManager.init<modes::Mode::kReco_Qa>(&hRegistry, colHistSpec, confCollisionBinning, confCollisionQaBinning);
9898
trackHistSpec = trackhistmanager::makeTrackQaHistSpecMap(confTrackBinning, confTrackQaBinning);

‎PWGCF/Femto/Tasks/femtoTripletTrackTrackCascade.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ struct FemtoTripletTrackTrackCascade {
198198
}
199199
// setup columnpolicy for binning
200200
// default values are used during instantiation, so we need to explicity update them here
201-
mixBinsVtxMult = {{confMixing.vtxBins, confMixing.multBins.value}, true};
201+
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
202202
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
203203
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};
204204

‎PWGCF/Femto/Tasks/femtoTripletTrackTrackTrack.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ struct FemtoTripletTrackTrackTrack {
134134

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

0 commit comments

Comments
 (0)