Skip to content

Commit d336e35

Browse files
committed
Fix misc
1 parent 9007f34 commit d336e35

File tree

8 files changed

+15
-10
lines changed

8 files changed

+15
-10
lines changed

PWGHF/D2H/Tasks/taskCharmPolarisation.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,7 @@ struct HfTaskCharmPolarisation {
15381538
ptBhadMother = candidate.ptBhadMotherPart();
15391539
int pdgBhadMother = candidate.pdgBhadMotherPart();
15401540
// For unknown reasons there are charm hadrons coming directly from beauty diquarks without an intermediate B-hadron which have an unreasonable correlation between the pT of the charm hadron and the beauty mother. We also remove charm hadrons from quarkonia.
1541-
if (origin == RecoDecay::OriginType::NonPrompt && (pdgBhadMother == 5101 || pdgBhadMother == 5103 || pdgBhadMother == 5201 || pdgBhadMother == 5203 || pdgBhadMother == 5301 || pdgBhadMother == 5303 || pdgBhadMother == 5401 || pdgBhadMother == 5403 || pdgBhadMother == 5503 || pdgBhadMother == 553 || pdgBhadMother == 555 || pdgBhadMother == 553 || pdgBhadMother == 557)) { // o2-linter: disable=pdg/explicit-code, magic-number (constants not in the PDG header)
1541+
if (origin == RecoDecay::OriginType::NonPrompt && (pdgBhadMother == 5101 || pdgBhadMother == 5103 || pdgBhadMother == 5201 || pdgBhadMother == 5203 || pdgBhadMother == 5301 || pdgBhadMother == 5303 || pdgBhadMother == 5401 || pdgBhadMother == 5403 || pdgBhadMother == 5503 || pdgBhadMother == 553 || pdgBhadMother == 555 || pdgBhadMother == 557)) { // o2-linter: disable=pdg/explicit-code, magic-number (constants not in the PDG header)
15421542
return isCandidateInSignalRegion;
15431543
}
15441544
} else if constexpr (Channel == charm_polarisation::DecayChannel::LcToPKPi) {
@@ -2085,7 +2085,7 @@ struct HfTaskCharmPolarisation {
20852085
auto bHadMother = mcParticles.rawIteratorAt(mcParticle.idxBhadMotherPart() - mcParticles.offset());
20862086
int pdgBhadMother = std::abs(bHadMother.pdgCode());
20872087
// For unknown reasons there are charm hadrons coming directly from beauty diquarks without an intermediate B-hadron which have an unreasonable correlation between the pT of the charm hadron and the beauty mother. We also remove charm hadrons from quarkonia.
2088-
if (pdgBhadMother == 5101 || pdgBhadMother == 5103 || pdgBhadMother == 5201 || pdgBhadMother == 5203 || pdgBhadMother == 5301 || pdgBhadMother == 5303 || pdgBhadMother == 5401 || pdgBhadMother == 5403 || pdgBhadMother == 5503 || pdgBhadMother == 553 || pdgBhadMother == 555 || pdgBhadMother == 553 || pdgBhadMother == 557) { // o2-linter: disable=pdg/explicit-code, magic-number (constants not in the PDG header)
2088+
if (pdgBhadMother == 5101 || pdgBhadMother == 5103 || pdgBhadMother == 5201 || pdgBhadMother == 5203 || pdgBhadMother == 5301 || pdgBhadMother == 5303 || pdgBhadMother == 5401 || pdgBhadMother == 5403 || pdgBhadMother == 5503 || pdgBhadMother == 553 || pdgBhadMother == 555 || pdgBhadMother == 557) { // o2-linter: disable=pdg/explicit-code, magic-number (constants not in the PDG header)
20892089
return;
20902090
}
20912091
ptBhadMother = bHadMother.pt();

PWGHF/HFC/Macros/DhCorrelationExtraction.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1321,7 +1321,7 @@ TH1D* DhCorrelationExtraction::reflectHistoRun2(TH1D* h, Double_t scale)
13211321
return h2;
13221322
}
13231323

1324-
Double_t DhCorrelationExtraction::getFdPromptFrac(Double_t ptCandMin, Double_t ptCandMax, Double_t ptHadMin, Double_t ptHadMax)
1324+
Double_t DhCorrelationExtraction::getFdPromptFrac(Double_t ptCandMin, Double_t ptCandMax, Double_t /*ptHadMin*/, Double_t /*ptHadMax*/)
13251325
{
13261326

13271327
TH1D* h1D = new TH1D();

PWGHF/HFC/Macros/ExtractOutputCorrel.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void extractOutputCorrelDs(const TString cfgFileName = "config_CorrAnalysis.json
143143
bool useSidebLeft = config["UseSidebLeft"].GetBool();
144144
bool useSidebRight = config["UseSidebRight"].GetBool();
145145

146-
if (useSidebLeft && useSidebLeft) {
146+
if (useSidebLeft && useSidebRight) {
147147
std::cout << "Using left and right" << std::endl;
148148
}
149149

PWGHF/HFC/Tasks/taskCorrelationDsHadrons.cxx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ enum ResonantChannel : int8_t {
6767
Kstar0K = 2
6868
};
6969

70-
static std::unordered_map<int8_t, int8_t> channelsResonant = {{{ResonantChannel::PhiPi, hf_decay::hf_cand_3prong::DecayChannelResonant::DsToPhiPi}, {ResonantChannel::Kstar0K, hf_decay::hf_cand_3prong::DecayChannelResonant::DsToKstar0K}}};
70+
namespace
71+
{
72+
std::unordered_map<int8_t, int8_t> channelsResonant = {{{ResonantChannel::PhiPi, hf_decay::hf_cand_3prong::DecayChannelResonant::DsToPhiPi}, {ResonantChannel::Kstar0K, hf_decay::hf_cand_3prong::DecayChannelResonant::DsToKstar0K}}};
73+
}
7174

7275
/// Ds-Hadron correlation pair filling task, from pair tables - for real data and data-like analysis (i.e. reco-level w/o matching request via MC truth)
7376
struct HfTaskCorrelationDsHadrons {

PWGHF/TableProducer/treeCreatorDsToKKPi.cxx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,11 @@ enum ResonantChannel : int8_t {
254254
Kstar0K = 2
255255
};
256256

257-
static std::unordered_map<int8_t, std::unordered_map<int8_t, int8_t>> channelsResonant = {{{Mother::Ds, {{ResonantChannel::PhiPi, hf_decay::hf_cand_3prong::DecayChannelResonant::DsToPhiPi}, {ResonantChannel::Kstar0K, hf_decay::hf_cand_3prong::DecayChannelResonant::DsToKstar0K}}},
258-
{Mother::Dplus, {{ResonantChannel::PhiPi, hf_decay::hf_cand_3prong::DecayChannelResonant::DplusToPhiPi}, {ResonantChannel::Kstar0K, hf_decay::hf_cand_3prong::DecayChannelResonant::DplusToKstar0K}}}}};
257+
namespace
258+
{
259+
std::unordered_map<int8_t, std::unordered_map<int8_t, int8_t>> channelsResonant = {{{Mother::Ds, {{ResonantChannel::PhiPi, hf_decay::hf_cand_3prong::DecayChannelResonant::DsToPhiPi}, {ResonantChannel::Kstar0K, hf_decay::hf_cand_3prong::DecayChannelResonant::DsToKstar0K}}},
260+
{Mother::Dplus, {{ResonantChannel::PhiPi, hf_decay::hf_cand_3prong::DecayChannelResonant::DplusToPhiPi}, {ResonantChannel::Kstar0K, hf_decay::hf_cand_3prong::DecayChannelResonant::DplusToKstar0K}}}}};
261+
}
259262

260263
/// Writes the full information in an output TTree
261264
struct HfTreeCreatorDsToKKPi {

PWGHF/TableProducer/treeCreatorLcToK0sP.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
using namespace o2;
4242
using namespace o2::framework;
4343
using namespace o2::framework::expressions;
44-
using std::array;
4544

4645
namespace o2::aod
4746
{

PWGHF/Utils/utilsAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ enum BHadMothers { NotMatched = 0,
3737
/// Convert the B hadron mother PDG for non prompt candidates to a flag
3838
/// \param flagBHad pdg of the b hadron mother
3939
/// \return integer map to specific mothers' PDG codes
40-
BHadMothers getBHadMotherFlag(const int flagBHad)
40+
inline BHadMothers getBHadMotherFlag(const int flagBHad)
4141
{
4242
if (std::abs(flagBHad) == o2::constants::physics::kBPlus) {
4343
return BHadMothers::BPlus;

PWGHF/Utils/utilsTrkCandHf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void setLabelHistoCands(THisto& hCandidates)
5050

5151
/// \brief Function to evaluate number of ones in a binary representation of the argument
5252
/// \param num is the input argument
53-
int countOnesInBinary(const uint8_t num)
53+
inline int countOnesInBinary(const uint8_t num)
5454
{
5555
int count{0};
5656
constexpr std::size_t NBits{8u};

0 commit comments

Comments
 (0)