Skip to content

Commit 50a65ac

Browse files
Luca610Luca610
committed
Some linter fixes
1 parent a5ddb68 commit 50a65ac

File tree

4 files changed

+28
-26
lines changed

4 files changed

+28
-26
lines changed

‎PWGHF/D2H/TableProducer/candidateCreatorCharmResoReduced.cxx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/// \brief Reconstruction of Resonance candidates
1414
///
1515
/// \author Luca Aglietta <[email protected]>, Università degli Studi di Torino
16+
1617
#include "PWGHF/D2H/Core/SelectorCutsRedDataFormat.h"
1718
#include "PWGHF/D2H/DataModel/ReducedDataModel.h"
1819
#include "PWGHF/Utils/utilsAnalysis.h"
@@ -111,7 +112,7 @@ struct HfCandidateCreatorCharmResoReduced {
111112
// D Configurables
112113
struct : ConfigurableGroup {
113114
Configurable<std::vector<double>> binsPtD{"binsPtD", std::vector<double>{hf_cuts_d_daughter::vecBinsPt}, "pT bin limits for D daughter cuts"};
114-
Configurable<LabeledArray<double>> cutsD{"cutsDmesDaughter", {hf_cuts_d_daughter::Cuts[0], hf_cuts_d_daughter::NBinsPt, hf_cuts_d_daughter::NCutVars, hf_cuts_d_daughter::labelsPt, hf_cuts_d_daughter::labelsCutVar}, "D daughter selections"};
115+
Configurable<LabeledArray<double>> cutsD{"cutsD", {hf_cuts_d_daughter::Cuts[0], hf_cuts_d_daughter::NBinsPt, hf_cuts_d_daughter::NCutVars, hf_cuts_d_daughter::labelsPt, hf_cuts_d_daughter::labelsCutVar}, "D daughter selections"};
115116
Configurable<bool> keepSideBands{"keepSideBands", false, "flag to keep events from D meson sidebands for backgorund estimation"};
116117
} cfgDmesCuts;
117118
// V0 cuts configurables
@@ -134,12 +135,12 @@ struct HfCandidateCreatorCharmResoReduced {
134135
} cfgMixedEvent;
135136
// Histogram axes configurables
136137
struct : ConfigurableGroup {
137-
ConfigurableAxis axisPtD{"axPtD", {100, 0., 50}, "#it{p}_{T} (GeV/#it{c})"};
138-
ConfigurableAxis axisPtV0{"axPtV0", {100, 0., 50}, "#it{p}_{T} (GeV/#it{c})"};
139-
ConfigurableAxis axisPtReso{"axPtReso", {100, 0., 50}, "#it{p}_{T} (GeV/#it{c})"};
140-
ConfigurableAxis axisMassD{"axMassD", {100, 1.7f, 2.1f}, "inv. mass (D) (GeV/#it{c}^{2})"};
141-
ConfigurableAxis axisMassV0{"axMassV0", {100, 0.45f, 0.55f}, "inv. mass (V_{0}) (GeV/#it{c}^{2})"};
142-
ConfigurableAxis axisMassDsj{"axMassReso", {400, 0.49f, 0.89f}, "inv. mass (DV_{0}) (GeV/#it{c}^{2})"};
138+
ConfigurableAxis axisPtD{"axisPtD", {100, 0., 50}, "#it{p}_{T} (GeV/#it{c})"};
139+
ConfigurableAxis axisPtV0{"axisPtV0", {100, 0., 50}, "#it{p}_{T} (GeV/#it{c})"};
140+
ConfigurableAxis axisPtReso{"axisPtReso", {100, 0., 50}, "#it{p}_{T} (GeV/#it{c})"};
141+
ConfigurableAxis axisMassD{"axisMassD", {100, 1.7f, 2.1f}, "inv. mass (D) (GeV/#it{c}^{2})"};
142+
ConfigurableAxis axisMassV0{"axisMassV0", {100, 0.45f, 0.55f}, "inv. mass (V_{0}) (GeV/#it{c}^{2})"};
143+
ConfigurableAxis axisMassDsj{"axisMassReso", {400, 0.49f, 0.89f}, "inv. mass (DV_{0}) (GeV/#it{c}^{2})"};
143144
} cfgHistAxes;
144145
// Other Configurables
145146
Configurable<bool> rejectPairsWithCommonDaughter{"rejectPairsWithCommonDaughter", true, "flag to reject the pairs that share a daughter track if not done in the derived data creation"};

‎PWGHF/D2H/Tasks/taskCharmResoToDTrkReduced.cxx‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file taskCharmResoReduced.cxx
13-
/// \brief Charmed Resonances analysis task
12+
/// \file taskCharmResoToDTrkReduced.cxx
13+
/// \brief Charmed Resonances decaying in a D meson and a Track analysis task
1414
///
1515
/// \author Luca Aglietta <[email protected]>, University and INFN Torino
1616

@@ -136,6 +136,10 @@ enum DecayChannel : uint8_t {
136136
struct HfTaskCharmResoToDTrkReduced {
137137
Produces<aod::HfCandDTrkLites> hfCandResoLite;
138138
Produces<aod::HfGenResoLites> hfGenResoLite;
139+
140+
using ReducedReso2PrTrk = soa::Join<aod::HfCandCharmReso, aod::Hf2PrTrkIds>;
141+
using ReducedReso2PrTrkMC = soa::Join<aod::HfCandCharmReso, aod::Hf2PrTrkIds, aod::HfMcRecRedResos>;
142+
139143
Configurable<bool> doWrongSign{"doWrongSign", false, "Flag to enable wrong sign candidates"};
140144
Configurable<float> ptMinReso{"ptMinReso", -1, "Discard events with smaller pT"};
141145
Configurable<bool> fillTrees{"fillTrees", true, "Fill output Trees"};
@@ -161,9 +165,6 @@ struct HfTaskCharmResoToDTrkReduced {
161165
ConfigurableAxis axisOrigin{"axisOrigin", {3, -0.5, 2.5}, "origin"};
162166
ConfigurableAxis axisFlag{"axisFlag", {65, -32.5, 32.5}, "mc flag"};
163167

164-
using ReducedReso2PrTrk = soa::Join<aod::HfCandCharmReso, aod::Hf2PrTrkIds>;
165-
using ReducedReso2PrTrkMC = soa::Join<aod::HfCandCharmReso, aod::Hf2PrTrkIds, aod::HfMcRecRedResos>;
166-
167168
// Histogram Registry
168169
HistogramRegistry registry;
169170

@@ -241,9 +242,9 @@ struct HfTaskCharmResoToDTrkReduced {
241242
return;
242243
}
243244
}
244-
if (origin == 1) {
245+
if (origin == RecoDecay::OriginType::Prompt) {
245246
registry.fill(HIST("hYRecPrompt"), candidate.pt(), y);
246-
} else if (origin == 2) {
247+
} else if (origin == RecoDecay::OriginType::NonPrompt) {
247248
registry.fill(HIST("hYRecNonPrompt"), candidate.pt(), y);
248249
}
249250
}
@@ -401,12 +402,12 @@ struct HfTaskCharmResoToDTrkReduced {
401402
if (yCandGenMax >= 0. && std::abs(yParticle) > yCandGenMax) {
402403
continue;
403404
}
404-
if (originParticle == 1) { // prompt particles
405+
if (originParticle == RecoDecay::OriginType::Prompt) { // prompt particles
405406
registry.fill(HIST("hYGenPrompt"), ptParticle, yParticle);
406407
if (prongsInAcc) {
407408
registry.fill(HIST("hYGenPromptWithProngsInAcceptance"), ptParticle, yParticle);
408409
}
409-
} else if (originParticle == 2) {
410+
} else if (originParticle == RecoDecay::OriginType::NonPrompt) {
410411
registry.fill(HIST("hYGenNonPrompt"), ptParticle, yParticle);
411412
if (prongsInAcc) {
412413
registry.fill(HIST("hYGenNonPromptWithProngsInAcceptance"), ptParticle, yParticle);

‎PWGHF/D2H/Tasks/taskCharmResoToDV0Reduced.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file taskCharmResoReduced.cxx
13-
/// \brief Charmed Resonances analysis task
12+
/// \file taskCharmResoToDV0Reduced.cxx
13+
/// \brief Charmed Resonances decaying in a D meson and a V0 analysis task
1414
///
1515
/// \author Luca Aglietta <[email protected]>, University and INFN Torino
1616

@@ -279,9 +279,9 @@ struct HfTaskCharmResoToDV0Reduced {
279279
return;
280280
}
281281
}
282-
if (origin == 1) {
282+
if (origin == RecoDecay::OriginType::Prompt) {
283283
registry.fill(HIST("hYRecPrompt"), candidate.pt(), y);
284-
} else if (origin == 2) {
284+
} else if (origin == RecoDecay::OriginType::NonPrompt) {
285285
registry.fill(HIST("hYRecNonPrompt"), candidate.pt(), y);
286286
}
287287
}
@@ -462,12 +462,12 @@ struct HfTaskCharmResoToDV0Reduced {
462462
if (yCandGenMax >= 0. && std::abs(yParticle) > yCandGenMax) {
463463
continue;
464464
}
465-
if (originParticle == 1) { // prompt particles
465+
if (originParticle == RecoDecay::OriginType::Prompt) { // prompt particles
466466
registry.fill(HIST("hYGenPrompt"), ptParticle, yParticle);
467467
if (prongsInAcc) {
468468
registry.fill(HIST("hYGenPromptWithProngsInAcceptance"), ptParticle, yParticle);
469469
}
470-
} else if (originParticle == 2) {
470+
} else if (originParticle == RecoDecay::OriginType::NonPrompt) {
471471
registry.fill(HIST("hYGenNonPrompt"), ptParticle, yParticle);
472472
if (prongsInAcc) {
473473
registry.fill(HIST("hYGenNonPromptWithProngsInAcceptance"), ptParticle, yParticle);

‎PWGJE/JetFinders/Duplicates/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ o2physics_add_dpl_workflow(jet-finder-mcd-charged-1
2222
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
2323
COMPONENT_NAME Analysis)
2424

25-
# o2physics_add_dpl_workflow(jet-finder-mcp-charged-1
26-
# SOURCES jetFinderMCPCharged1.cxx
27-
# PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
28-
# COMPONENT_NAME Analysis)
25+
o2physics_add_dpl_workflow(jet-finder-mcp-charged-1
26+
SOURCES jetFinderMCPCharged1.cxx
27+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
28+
COMPONENT_NAME Analysis)
2929

3030

3131
endif()

0 commit comments

Comments
 (0)