Skip to content

Commit 184ed13

Browse files
samrangysamrangy
committed
Fix O2 Linter warnings
1 parent 512d322 commit 184ed13

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

‎PWGHF/HFC/DataModel/CorrelationTables.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,3 +423,4 @@ DECLARE_SOA_TABLE(HfEHadronPair, "AOD", "HFEHADRONPAIR", //! Hfe-Hadrons pairs I
423423
} // namespace o2::aod
424424

425425
#endif // PWGHF_HFC_DATAMODEL_CORRELATIONTABLES_H_
426+

‎PWGHF/HFC/TableProducer/correlatorD0Hadrons.cxx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ using SelectedParticlesMcGen = soa::Join<aod::McParticles, aod::HfCand2ProngMcGe
8080

8181
// Code to select collisions with at least one D0
8282
struct HfCorrelatorD0HadronsSelection {
83-
SliceCache cache;
84-
8583
Produces<aod::DmesonSelection> d0Sel;
8684

8785
Configurable<int> selectionFlagD0{"selectionFlagD0", 1, "Selection Flag for D0"};
@@ -90,8 +88,9 @@ struct HfCorrelatorD0HadronsSelection {
9088
Configurable<float> ptCandMin{"ptCandMin", -1., "min. cand. pT"};
9189

9290
HfHelper hfHelper;
93-
91+
SliceCache cache;
9492
Preslice<aod::HfCand2Prong> perCol = aod::hf_cand::collisionId;
93+
9594
Partition<soa::Join<aod::HfCand2Prong, aod::HfSelD0>> selectedD0Candidates = aod::hf_sel_candidate_d0::isSelD0 >= selectionFlagD0 || aod::hf_sel_candidate_d0::isSelD0bar >= selectionFlagD0bar;
9695
Partition<soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec>> selectedD0candidatesMc = aod::hf_sel_candidate_d0::isSelD0 >= selectionFlagD0 || aod::hf_sel_candidate_d0::isSelD0bar >= selectionFlagD0bar;
9796

@@ -162,8 +161,6 @@ struct HfCorrelatorD0HadronsSelection {
162161

163162
/// D0-Hadron correlation pair builder - for real data and data-like analysis (i.e. reco-level w/o matching request via MC truth)
164163
struct HfCorrelatorD0Hadrons {
165-
SliceCache cache;
166-
167164
Produces<aod::D0HadronPair> entryD0HadronPair;
168165
Produces<aod::D0HadronRecoInfo> entryD0HadronRecoInfo;
169166
Produces<aod::D0HadronMlInfo> entryD0HadronMlInfo;
@@ -178,36 +175,38 @@ struct HfCorrelatorD0Hadrons {
178175
Configurable<float> ptCandMin{"ptCandMin", 1., "min. cand. pT"};
179176
Configurable<float> ptTrackMin{"ptTrackMin", 0.3, "min. track pT"};
180177
Configurable<float> ptTrackMax{"ptTrackMax", 99., "max. track pT"};
181-
Configurable<std::vector<double>> bins{"ptBinsForMassAndEfficiency", std::vector<double>{o2::analysis::hf_cuts_d0_to_pi_k::vecBinsPt}, "pT bin limits for candidate mass plots and efficiency"};
178+
Configurable<std::vector<double>> bins{"bins", std::vector<double>{o2::analysis::hf_cuts_d0_to_pi_k::vecBinsPt}, "pT bin limits for candidate mass plots and efficiency"};
182179
Configurable<std::vector<double>> efficiencyDmeson{"efficiencyDmeson", std::vector<double>{vecEfficiencyDmeson}, "Efficiency values for D0 meson"};
183-
Configurable<int> applyEfficiency{"efficiencyFlagD", 1, "Flag for applying D-meson efficiency weights"};
180+
Configurable<int> applyEfficiency{"applyEfficiency", 1, "Flag for applying D-meson efficiency weights"};
184181
Configurable<float> multMin{"multMin", 0., "minimum multiplicity accepted"};
185182
Configurable<float> multMax{"multMax", 10000., "maximum multiplicity accepted"};
186183
Configurable<float> ptSoftPionMax{"ptSoftPionMax", 3.f * 800.f * std::pow(10.f, -6.f), "max. pT cut for soft pion identification"};
187184
Configurable<std::vector<int>> classMl{"classMl", {0, 1, 2}, "Indexes of ML scores to be stored. Three indexes max."};
188185
Configurable<bool> correlateD0WithLeadingParticle{"correlateD0WithLeadingParticle", false, "Switch for correlation of D0 mesons with leading particle only"};
189186
Configurable<bool> storeAutoCorrelationFlag{"storeAutoCorrelationFlag", false, "Store flag that indicates if the track is paired to its D-meson mother instead of skipping it"};
190187
Configurable<int> numberEventsMixed{"numberEventsMixed", 5, "Number of events mixed in ME process"};
191-
ConfigurableAxis zPoolBins{"zPoolBins", {VARIABLE_WIDTH, -10.0f, -2.5f, 2.5f, 10.0f}, "z vertex position pools"};
192-
ConfigurableAxis multPoolBins{"multPoolBins", {VARIABLE_WIDTH, 0.0f, 2000.0f, 6000.0f, 10000.0f}, "event multiplicity pools (FT0M)"};
193-
ConfigurableAxis multPoolBinsMcGen{"multPoolBinsMcGen", {VARIABLE_WIDTH, 0.0f, 20.0f, 50.0f, 500.0f}, "Mixing bins - MC multiplicity"}; // In MCGen multiplicity is defined by counting tracks
194-
195-
HfHelper hfHelper;
196-
BinningType corrBinning{{zPoolBins, multPoolBins}, true};
197188

198189
int leadingIndex = 0;
199190
double massD0{0.};
200191
double massPi{0.};
201192
double massK{0.};
202193
double softPiMass = 0.14543; // pion mass + Q-value of the D*->D0pi decay
203194

204-
Preslice<aod::HfCand2Prong> perCol = aod::hf_cand::collisionId;
205-
206195
Filter collisionFilter = aod::hf_selection_dmeson_collision::dmesonSel == true;
207196
Filter trackFilter = requireGlobalTrackWoDCAInFilter() && (nabs(aod::track::eta) < etaTrackMax) && (aod::track::pt > ptTrackMin) && (aod::track::pt < ptTrackMax) && (nabs(aod::track::dcaXY) < dcaXYTrackMax) && (nabs(aod::track::dcaZ) < dcaZTrackMax);
208197
Filter d0Filter = (aod::hf_sel_candidate_d0::isSelD0 >= 1) || (aod::hf_sel_candidate_d0::isSelD0bar >= 1);
209198
Filter collisionFilterGen = aod::hf_selection_dmeson_collision::dmesonSel == true;
210199
Filter particlesFilter = nabs(aod::mcparticle::pdgCode) == static_cast<int>(Pdg::kD0) || ((aod::mcparticle::flags & (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary) == (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary);
200+
201+
HfHelper hfHelper;
202+
SliceCache cache;
203+
Preslice<aod::HfCand2Prong> perCol = aod::hf_cand::collisionId;
204+
205+
ConfigurableAxis zPoolBins{"zPoolBins", {VARIABLE_WIDTH, -10.0f, -2.5f, 2.5f, 10.0f}, "z vertex position pools"};
206+
ConfigurableAxis multPoolBins{"multPoolBins", {VARIABLE_WIDTH, 0.0f, 2000.0f, 6000.0f, 10000.0f}, "event multiplicity pools (FT0M)"};
207+
ConfigurableAxis multPoolBinsMcGen{"multPoolBinsMcGen", {VARIABLE_WIDTH, 0.0f, 20.0f, 50.0f, 500.0f}, "Mixing bins - MC multiplicity"}; // In MCGen multiplicity is defined by counting tracks
208+
209+
BinningType corrBinning{{zPoolBins, multPoolBins}, true};
211210

212211
HistogramRegistry registry{
213212
"registry",
@@ -925,3 +924,4 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
925924
adaptAnalysisTask<HfCorrelatorD0HadronsSelection>(cfgc),
926925
adaptAnalysisTask<HfCorrelatorD0Hadrons>(cfgc)};
927926
}
927+

‎PWGHF/HFC/Tasks/taskCorrelationD0Hadrons.cxx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ const double ptHadronMax = 10.0;
8686
struct HfTaskCorrelationD0Hadrons {
8787

8888
// pT ranges for correlation plots: the default values are those embedded in hf_cuts_d0_to_pi_k (i.e. the mass pT bins), but can be redefined via json files
89-
Configurable<std::vector<double>> binsCorrelations{"ptBinsForCorrelations", std::vector<double>{vecPtBinsCorrelations}, "pT bin limits for correlation plots"};
89+
Configurable<std::vector<double>> binsCorrelations{"binsCorrelations", std::vector<double>{vecPtBinsCorrelations}, "pT bin limits for correlation plots"};
9090
// pT bins for effiencies: same as above
91-
Configurable<std::vector<double>> binsEfficiency{"ptBinsForEfficiency", std::vector<double>{o2::analysis::hf_cuts_d0_to_pi_k::vecBinsPt}, "pT bin limits for efficiency"};
91+
Configurable<std::vector<double>> binsEfficiency{"binsEfficiency", std::vector<double>{o2::analysis::hf_cuts_d0_to_pi_k::vecBinsPt}, "pT bin limits for efficiency"};
9292
Configurable<std::vector<int>> classMl{"classMl", {0, 1, 2}, "Indexes of ML scores to be stored. Three indexes max."};
93-
Configurable<std::vector<double>> mlOutputPromptD0{"mlScorePromptD0", {0.5, 0.5, 0.5, 0.5}, "Machine learning scores for prompt"};
94-
Configurable<std::vector<double>> mlOutputBkgD0{"mlScoreBkgD0", {0.5, 0.5, 0.5, 0.5}, "Machine learning scores for bkg"};
95-
Configurable<std::vector<double>> mlOutputPromptD0bar{"mlScorePromptD0bar", {0.5, 0.5, 0.5, 0.5}, "Machine learning scores for prompt"};
96-
Configurable<std::vector<double>> mlOutputBkgD0bar{"mlScoreBkgD0bar", {0.5, 0.5, 0.5, 0.5}, "Machine learning scores for bkg"};
93+
Configurable<std::vector<double>> mlOutputPromptD0{"mlOutputPromptD0", {0.5, 0.5, 0.5, 0.5}, "Machine learning scores for prompt"};
94+
Configurable<std::vector<double>> mlOutputBkgD0{"mlOutputBkgD0", {0.5, 0.5, 0.5, 0.5}, "Machine learning scores for bkg"};
95+
Configurable<std::vector<double>> mlOutputPromptD0bar{"mlOutputPromptD0bar", {0.5, 0.5, 0.5, 0.5}, "Machine learning scores for prompt"};
96+
Configurable<std::vector<double>> mlOutputBkgD0bar{"mlOutputBkgD0bar", {0.5, 0.5, 0.5, 0.5}, "Machine learning scores for bkg"};
9797
// signal and sideband region edges, to be defined via json file (initialised to empty)
9898
Configurable<std::vector<double>> signalRegionLeft{"signalRegionLeft", std::vector<double>{vecsignalRegionLeft}, "Inner values of signal region vs pT"};
9999
Configurable<std::vector<double>> signalRegionRight{"signalRegionRight", std::vector<double>{vecsignalRegionRight}, "Outer values of signal region vs pT"};
@@ -104,7 +104,7 @@ struct HfTaskCorrelationD0Hadrons {
104104
Configurable<std::vector<double>> efficiencyDmeson{"efficiencyDmeson", std::vector<double>{vecEfficiencyDmeson}, "Efficiency values for D meson specie under study"};
105105
Configurable<bool> isTowardTransverseAway{"isTowardTransverseAway", false, "Divide into three regions: toward, transverse, and away"};
106106
Configurable<double> leadingParticlePtMin{"leadingParticlePtMin", 0., "Min for leading particle pt"};
107-
Configurable<int> applyEfficiency{"efficiencyFlagD", 1, "Flag for applying efficiency weights"};
107+
Configurable<int> applyEfficiency{"applyEfficiency", 1, "Flag for applying efficiency weights"};
108108

109109
HistogramRegistry registry{
110110
"registry",
@@ -668,3 +668,4 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
668668
{
669669
return WorkflowSpec{adaptAnalysisTask<HfTaskCorrelationD0Hadrons>(cfgc)};
670670
}
671+

0 commit comments

Comments
 (0)