Skip to content

Commit 1c28d05

Browse files
vkuceravkucera
committed
Remove unnecessary use of HF namespaces
1 parent 378a846 commit 1c28d05

94 files changed

Lines changed: 254 additions & 484 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎EventFiltering/PWGHF/HFFilter.cxx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ using namespace o2;
4040
using namespace o2::framework;
4141
using namespace o2::framework::expressions;
4242
using namespace o2::aod::hffilters;
43-
using namespace hf_cuts_single_track;
44-
using namespace hf_cuts_bdt_multiclass;
4543

4644
struct HfFilter { // Main struct for HF triggers
4745

‎PWGCF/FemtoWorld/TableProducer/femtoWorldProducerTask.cxx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ using namespace o2;
4949
using namespace o2::analysis::femtoWorld;
5050
using namespace o2::framework;
5151
using namespace o2::framework::expressions;
52-
using namespace o2::aod::hf_cand_2prong;
53-
using namespace o2::analysis::hf_cuts_d0_to_pi_k;
5452

5553
namespace o2::aod
5654
{
@@ -1144,7 +1142,7 @@ struct femtoWorldProducerTask {
11441142
// loop over 2-prong candidates
11451143
for (auto& candidate : candidates) { // selectedD0Candidates
11461144

1147-
if (!(candidate.hfflag() & 1 << DecayType::D0ToPiK)) {
1145+
if (!(candidate.hfflag() & 1 << aod::hf_cand_2prong::DecayType::D0ToPiK)) {
11481146
continue;
11491147
}
11501148
if (yCandMax >= 0. && std::abs(hfHelper.yD0(candidate)) > yCandMax) {
@@ -2091,7 +2089,7 @@ struct femtoWorldProducerTask {
20912089

20922090
// loop over 2-prong candidates
20932091
for (const auto& candidate : candidates) { // selectedD0Candidates
2094-
if (!(candidate.hfflag() & 1 << DecayType::D0ToPiK)) {
2092+
if (!(candidate.hfflag() & 1 << aod::hf_cand_2prong::DecayType::D0ToPiK)) {
20952093
continue;
20962094
}
20972095
if (yCandMax >= 0. && std::abs(hfHelper.yD0(candidate)) > yCandMax) {

‎PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackD0.cxx‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ using namespace o2::framework;
3838
using namespace o2::framework::expressions;
3939
using namespace o2::soa;
4040

41-
using namespace o2::aod::hf_cand;
42-
using namespace o2::aod::hf_correlation_d_dbar;
43-
using namespace o2::aod::hf_cand_2prong;
44-
using namespace o2::analysis::hf_cuts_d0_to_pi_k;
45-
using namespace o2::constants::math;
4641

4742
namespace
4843
{

‎PWGDQ/Tasks/taskJpsiHf.cxx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ using namespace o2;
3030
using namespace o2::framework;
3131
using namespace o2::framework::expressions;
3232
using namespace o2::aod;
33-
using namespace o2::aod::hf_cand_2prong;
3433

3534
// Declarations of various short names
3635
using MyEvents = soa::Join<aod::Collisions, aod::EvSels>;
@@ -111,7 +110,7 @@ struct taskJPsiHf {
111110
{
112111
if (configDebug) {
113112
for (auto& dmeson : dmesons) {
114-
if (!TESTBIT(dmeson.hfflag(), DecayType::D0ToPiK)) {
113+
if (!TESTBIT(dmeson.hfflag(), hf_cand_2prong::DecayType::D0ToPiK)) {
115114
continue;
116115
}
117116

@@ -164,7 +163,7 @@ struct taskJPsiHf {
164163

165164
// loop over D mesons
166165
for (auto& dmeson : dmesons) {
167-
if (!TESTBIT(dmeson.hfflag(), DecayType::D0ToPiK)) {
166+
if (!TESTBIT(dmeson.hfflag(), hf_cand_2prong::DecayType::D0ToPiK)) {
168167
continue;
169168
}
170169

‎PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
using namespace o2;
3131
using namespace o2::aod;
3232
using namespace o2::framework;
33-
using namespace o2::aod::hf_cand;
34-
// using namespace o2::aod::alice3ecal;
35-
using namespace o2::aod::hf_cand_2prong;
36-
using namespace o2::aod::hf_cand_chic;
3733
using namespace o2::framework::expressions;
3834

3935
void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)

‎PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
using namespace o2;
3131
using namespace o2::aod;
3232
using namespace o2::framework;
33-
using namespace o2::aod::hf_cand;
34-
using namespace o2::aod::hf_cand_2prong;
35-
using namespace o2::aod::hf_cand_x;
3633
using namespace o2::framework::expressions;
3734

3835
void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)

‎PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
using namespace o2;
2727
using namespace o2::aod;
2828
using namespace o2::framework;
29-
using namespace o2::aod::hf_cand_chic;
3029
using namespace o2::analysis;
31-
using namespace o2::analysis::hf_cuts_chic_to_jpsi_gamma;
3230

3331
/// Struct for applying Jpsi selection cuts
3432
struct HfCandidateSelectorChicToJpsiGamma {
@@ -47,7 +45,7 @@ struct HfCandidateSelectorChicToJpsiGamma {
4745
Configurable<double> nSigmaTofMax{"nSigmaTofMax", 3., "Nsigma cut on TOF only"};
4846
// topological cuts
4947
Configurable<std::vector<double>> binsPt{"binsPt", std::vector<double>{hf_cuts_chic_to_jpsi_gamma::vecBinsPt}, "pT bin limits"};
50-
Configurable<LabeledArray<double>> cuts{"cuts", {hf_cuts_chic_to_jpsi_gamma::cuts[0], nBinsPt, nCutVars, labelsPt, labelsCutVar}, "Jpsi candidate selection per pT bin"};
48+
Configurable<LabeledArray<double>> cuts{"cuts", {hf_cuts_chic_to_jpsi_gamma::cuts[0], hf_cuts_chic_to_jpsi_gamma::nBinsPt, hf_cuts_chic_to_jpsi_gamma::nCutVars, hf_cuts_chic_to_jpsi_gamma::labelsPt, hf_cuts_chic_to_jpsi_gamma::labelsCutVar}, "Jpsi candidate selection per pT bin"};
5149

5250
HfHelper hfHelper;
5351

‎PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
using namespace o2;
2828
using namespace o2::framework;
2929
using namespace o2::framework::expressions;
30-
using namespace o2::aod::hf_cand_2prong;
31-
using namespace o2::analysis::hf_cuts_d0_to_pi_k;
3230

3331
namespace o2::aod
3432
{
@@ -65,7 +63,7 @@ struct HfCandidateSelectorD0Alice3Barrel {
6563
Configurable<double> nSigmaTofCombinedMax{"nSigmaTofCombinedMax", 5., "Nsigma cut on TOF combined with TPC"};
6664
// topological cuts
6765
Configurable<std::vector<double>> binsPt{"binsPt", std::vector<double>{hf_cuts_d0_to_pi_k::vecBinsPt}, "pT bin limits"};
68-
Configurable<LabeledArray<double>> cuts{"cuts", {hf_cuts_d0_to_pi_k::cuts[0], nBinsPt, nCutVars, labelsPt, labelsCutVar}, "D0 candidate selection per pT bin"};
66+
Configurable<LabeledArray<double>> cuts{"cuts", {hf_cuts_d0_to_pi_k::cuts[0], hf_cuts_d0_to_pi_k::nBinsPt, hf_cuts_d0_to_pi_k::nCutVars, hf_cuts_d0_to_pi_k::labelsPt, hf_cuts_d0_to_pi_k::labelsCutVar}, "D0 candidate selection per pT bin"};
6967

7068
HfHelper hfHelper;
7169

@@ -194,7 +192,7 @@ struct HfCandidateSelectorD0Alice3Barrel {
194192
int statusD0RICHPID = 0;
195193
int statusD0TofPlusRichPid = 0;
196194
int statusD0barTofPlusRichPid = 0;
197-
if (!(candidate.hfflag() & 1 << DecayType::D0ToPiK)) {
195+
if (!(candidate.hfflag() & 1 << aod::hf_cand_2prong::DecayType::D0ToPiK)) {
198196
hfSelD0CandidateALICE3Barrel(statusHFFlag, statusD0NoPid, statusD0PerfectPid, statusD0TofPid, statusD0RICHPID, statusD0TofPlusRichPid, statusD0barTofPlusRichPid);
199197
continue;
200198
}

‎PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
using namespace o2;
2828
using namespace o2::framework;
2929
using namespace o2::framework::expressions;
30-
using namespace o2::aod::hf_cand_2prong;
31-
using namespace o2::analysis::hf_cuts_d0_to_pi_k;
3230

3331
namespace o2::aod
3432
{
@@ -65,7 +63,7 @@ struct HfCandidateSelectorD0Alice3Forward {
6563
Configurable<double> nSigmaTofCombinedMax{"nSigmaTofCombinedMax", 5., "Nsigma cut on TOF combined with TPC"};
6664
// topological cuts
6765
Configurable<std::vector<double>> binsPt{"binsPt", std::vector<double>{hf_cuts_d0_to_pi_k::vecBinsPt}, "pT bin limits"};
68-
Configurable<LabeledArray<double>> cuts{"cuts", {hf_cuts_d0_to_pi_k::cuts[0], nBinsPt, nCutVars, labelsPt, labelsCutVar}, "D0 candidate selection per pT bin"};
66+
Configurable<LabeledArray<double>> cuts{"cuts", {hf_cuts_d0_to_pi_k::cuts[0], hf_cuts_d0_to_pi_k::nBinsPt, hf_cuts_d0_to_pi_k::nCutVars, hf_cuts_d0_to_pi_k::labelsPt, hf_cuts_d0_to_pi_k::labelsCutVar}, "D0 candidate selection per pT bin"};
6967

7068
HfHelper hfHelper;
7169

@@ -191,7 +189,7 @@ struct HfCandidateSelectorD0Alice3Forward {
191189
int statusD0NoPid = 0;
192190
int statusD0RICHPID = 0;
193191

194-
if (!(candidate.hfflag() & 1 << DecayType::D0ToPiK)) {
192+
if (!(candidate.hfflag() & 1 << aod::hf_cand_2prong::DecayType::D0ToPiK)) {
195193
hfSelD0CandidateALICE3Forward(statusHFFlag, statusD0NoPid, statusD0RICHPID);
196194
continue;
197195
}

‎PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
using namespace o2;
2828
using namespace o2::framework;
2929
using namespace o2::framework::expressions;
30-
using namespace o2::aod::hf_cand_2prong;
31-
using namespace o2::analysis::hf_cuts_d0_to_pi_k;
3230

3331
namespace o2::aod
3432
{
@@ -65,7 +63,7 @@ struct HfCandidateSelectorD0ParametrizedPid {
6563
Configurable<double> nSigmaTofCombinedMax{"nSigmaTofCombinedMax", 5., "Nsigma cut on TOF combined with TPC"};
6664
// topological cuts
6765
Configurable<std::vector<double>> binsPt{"binsPt", std::vector<double>{hf_cuts_d0_to_pi_k::vecBinsPt}, "pT bin limits"};
68-
Configurable<LabeledArray<double>> cuts{"cuts", {hf_cuts_d0_to_pi_k::cuts[0], nBinsPt, nCutVars, labelsPt, labelsCutVar}, "D0 candidate selection per pT bin"};
66+
Configurable<LabeledArray<double>> cuts{"cuts", {hf_cuts_d0_to_pi_k::cuts[0], hf_cuts_d0_to_pi_k::nBinsPt, hf_cuts_d0_to_pi_k::nCutVars, hf_cuts_d0_to_pi_k::labelsPt, hf_cuts_d0_to_pi_k::labelsCutVar}, "D0 candidate selection per pT bin"};
6967

7068
HfHelper hfHelper;
7169

@@ -194,7 +192,7 @@ struct HfCandidateSelectorD0ParametrizedPid {
194192
int statusD0barPerfectPid = 0;
195193
int statusD0bar = 0;
196194

197-
if (!(candidate.hfflag() & 1 << DecayType::D0ToPiK)) {
195+
if (!(candidate.hfflag() & 1 << aod::hf_cand_2prong::DecayType::D0ToPiK)) {
198196
hfSelD0CandidateparametrizedPID(statusD0NoPid, statusD0PerfectPid, statusD0, statusD0barNoPid, statusD0barPerfectPid, statusD0bar);
199197
continue;
200198
}

0 commit comments

Comments
 (0)