Skip to content

Commit 7c1f14f

Browse files
authored
Merge pull request #33 from alibuild/alibot-cleanup-11678
Please consider the following formatting changes to #11678
2 parents 5269d07 + 3c3881e commit 7c1f14f

File tree

2 files changed

+49
-48
lines changed

2 files changed

+49
-48
lines changed

PWGHF/HFC/TableProducer/correlatorLcScHadrons.cxx

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,19 @@ struct HfCorrelatorLcScHadronsSelection {
9393
if (doSelLcCollision) {
9494
for (const auto& candidate : candidates) {
9595

96-
if constexpr (isCandSc) {
97-
int8_t chargeCand = candidate.charge();
96+
if constexpr (isCandSc) {
97+
int8_t chargeCand = candidate.charge();
9898

99-
if (chargeCand == chargeScZero) {
100-
yCand = hfHelper.ySc0(candidate);
101-
} else {
102-
yCand = hfHelper.yScPlusPlus(candidate);
103-
}
99+
if (chargeCand == chargeScZero) {
100+
yCand = hfHelper.ySc0(candidate);
101+
} else {
102+
yCand = hfHelper.yScPlusPlus(candidate);
103+
}
104+
105+
} else {
106+
yCand = hfHelper.yLc(candidate);
107+
}
104108

105-
} else {
106-
yCand = hfHelper.yLc(candidate);
107-
}
108-
109109
if (std::abs(yCand) > yCandMax || candidate.pt() < ptCandMin) {
110110
isCandFound = false;
111111
continue;
@@ -132,7 +132,7 @@ struct HfCorrelatorLcScHadronsSelection {
132132
for (const auto& particle : mcParticles) {
133133

134134
isCandFound = matchCandAndMass<isCandSc>(particle, massCand);
135-
if (!isCandFound){
135+
if (!isCandFound) {
136136
continue;
137137
}
138138

@@ -150,31 +150,31 @@ struct HfCorrelatorLcScHadronsSelection {
150150

151151
/// Code to select collisions with at least one Lc - for real data and data-like analysis
152152
void processLcSelection(SelCollisions::iterator const& collision,
153-
CandsLcDataFiltered const& candidates)
153+
CandsLcDataFiltered const& candidates)
154154
{
155-
selectionCollision<false>(collision,candidates);
155+
selectionCollision<false>(collision, candidates);
156156
}
157157
PROCESS_SWITCH(HfCorrelatorLcScHadronsSelection, processLcSelection, "Process Lc Collision Selection for Data and Mc", true);
158158

159-
void processScSelection(SelCollisions::iterator const& collision,
160-
aod::HfCandSc const& candidates)
159+
void processScSelection(SelCollisions::iterator const& collision,
160+
aod::HfCandSc const& candidates)
161161
{
162-
selectionCollision<true>(collision,candidates);
162+
selectionCollision<true>(collision, candidates);
163163
}
164164
PROCESS_SWITCH(HfCorrelatorLcScHadronsSelection, processScSelection, "Process Sc Collision Selection for Data and Mc", false);
165165

166-
void processLcSelectionMcRec(SelCollisions::iterator const& collision,
166+
void processLcSelectionMcRec(SelCollisions::iterator const& collision,
167167
CandsLcMcRecFiltered const& candidates)
168168
{
169-
selectionCollision<false>(collision,candidates);
169+
selectionCollision<false>(collision, candidates);
170170
}
171-
PROCESS_SWITCH(HfCorrelatorLcScHadronsSelection, processLcSelectionMcRec, "Process Lc Selection McRec", false);
171+
PROCESS_SWITCH(HfCorrelatorLcScHadronsSelection, processLcSelectionMcRec, "Process Lc Selection McRec", false);
172172

173173
void processScSelectionMcRec(SelCollisions::iterator const& collision,
174-
CandsScMcRec const& candidates)
175-
{
176-
selectionCollision<true>(collision,candidates);
177-
}
174+
CandsScMcRec const& candidates)
175+
{
176+
selectionCollision<true>(collision, candidates);
177+
}
178178
PROCESS_SWITCH(HfCorrelatorLcScHadronsSelection, processScSelectionMcRec, "Process Sc Selection McRec", false);
179179

180180
void processLcSelectionMcGen(aod::McCollision const&,
@@ -254,12 +254,12 @@ struct HfCorrelatorLcScHadrons {
254254
bool isSignal = false;
255255

256256
TRandom3* rnd = new TRandom3(0);
257-
//std::vector<float> outputMl = {-1., -1., -1.};
257+
// std::vector<float> outputMl = {-1., -1., -1.};
258258
std::vector<float> outputMlPKPi = {-1., -1., -1.};
259259
std::vector<float> outputMlPiKP = {-1., -1., -1.};
260260

261261
// Event Mixing for the Data Mode
262-
//using SelCollisionsWithSc = soa::Join<aod::Collisions, aod::Mults, aod::EvSels>;
262+
// using SelCollisionsWithSc = soa::Join<aod::Collisions, aod::Mults, aod::EvSels>;
263263
using SelCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::Mults, aod::EvSels, aod::LcSelection>>;
264264
using SelCollisionsMc = soa::Filtered<soa::Join<aod::McCollisions, aod::LcSelection, aod::MultsExtraMC>>; // collisionFilter applied
265265

@@ -867,7 +867,8 @@ struct HfCorrelatorLcScHadrons {
867867
}
868868

869869
template <bool isCandSc, typename CollisionType, typename PartType>
870-
void doSameEventMcGen(CollisionType const& mcCollision, PartType const& mcParticles){
870+
void doSameEventMcGen(CollisionType const& mcCollision, PartType const& mcParticles)
871+
{
871872

872873
int counterCharmCand = 0;
873874
registry.fill(HIST("hMcEvtCount"), 0);
@@ -883,9 +884,8 @@ struct HfCorrelatorLcScHadrons {
883884
for (const auto& particle : mcParticles) {
884885

885886
double massCand = -999.0;
886-
bool isCandFound = isCandSc ? matchCandAndMass<true>(particle, massCand) :
887-
matchCandAndMass<false>(particle, massCand);
888-
if (!isCandFound){
887+
bool isCandFound = isCandSc ? matchCandAndMass<true>(particle, massCand) : matchCandAndMass<false>(particle, massCand);
888+
if (!isCandFound) {
889889
continue;
890890
}
891891
double yCand = RecoDecay::y(particle.pVector(), massCand);
@@ -899,10 +899,10 @@ struct HfCorrelatorLcScHadrons {
899899
registry.fill(HIST("hPhiMcGen"), RecoDecay::constrainAngle(particle.phi(), -PIHalf));
900900
registry.fill(HIST("hYMcGen"), yCand);
901901

902-
int8_t chargeLc = pdg->GetParticle(particle.pdgCode())->Charge(); // Retrieve charge
903-
if (chargeLc != 0){
904-
chargeLc = chargeLc / std::abs(chargeLc);
905-
}
902+
int8_t chargeLc = pdg->GetParticle(particle.pdgCode())->Charge(); // Retrieve charge
903+
if (chargeLc != 0) {
904+
chargeLc = chargeLc / std::abs(chargeLc);
905+
}
906906

907907
isPrompt = particle.originMcGen() == RecoDecay::OriginType::Prompt;
908908
isNonPrompt = particle.originMcGen() == RecoDecay::OriginType::NonPrompt;
@@ -920,19 +920,19 @@ struct HfCorrelatorLcScHadrons {
920920
listDaughters.clear();
921921
const size_t expectedDaughters = isCandSc ? 4 : 3;
922922

923-
if (isCandSc){
924-
if (massCand == o2::constants::physics::MassSigmaC0 || massCand == o2::constants::physics::MassSigmaCStar0){
923+
if (isCandSc) {
924+
if (massCand == o2::constants::physics::MassSigmaC0 || massCand == o2::constants::physics::MassSigmaCStar0) {
925925
std::array<int, NDaughtersSc> arrDaughSc0PDG = {kProton, -kKPlus, kPiPlus, kPiMinus};
926926
RecoDecay::getDaughters(particle, &listDaughters, arrDaughSc0PDG, 2);
927927
} else {
928928
std::array<int, NDaughtersSc> arrDaughScPlusPDG = {kProton, -kKPlus, kPiPlus, kPiPlus};
929929
RecoDecay::getDaughters(particle, &listDaughters, arrDaughScPlusPDG, 2);
930930
}
931931
} else {
932-
std::array<int, NDaughtersLc> arrDaughLcPDG = {kProton, -kKPlus, kPiPlus};
933-
RecoDecay::getDaughters(particle, &listDaughters, arrDaughLcPDG, 2);
932+
std::array<int, NDaughtersLc> arrDaughLcPDG = {kProton, -kKPlus, kPiPlus};
933+
RecoDecay::getDaughters(particle, &listDaughters, arrDaughLcPDG, 2);
934934
}
935-
935+
936936
int counterDaughters = 0;
937937
std::vector<int> prongsId(expectedDaughters);
938938
if (listDaughters.size() == expectedDaughters) {
@@ -954,9 +954,9 @@ struct HfCorrelatorLcScHadrons {
954954

955955
if (std::find(prongsId.begin(), prongsId.end(), particleAssoc.globalIndex()) != prongsId.end()) {
956956
if (!storeAutoCorrelationFlag) {
957-
continue;
958-
}
959-
correlationStatus = true;
957+
continue;
958+
}
959+
correlationStatus = true;
960960
}
961961

962962
if ((std::abs(particleAssoc.pdgCode()) != kElectron) && (std::abs(particleAssoc.pdgCode()) != kMuonMinus) && (std::abs(particleAssoc.pdgCode()) != kPiPlus) && (std::abs(particle.pdgCode()) != kKPlus) && (std::abs(particleAssoc.pdgCode()) != kProton)) {
@@ -1083,14 +1083,14 @@ struct HfCorrelatorLcScHadrons {
10831083

10841084
/// Lc-Hadron correlation pair builder - for Mc Gen-level analysis
10851085
void processMcGenLc(SelCollisionsMc::iterator const& mcCollision,
1086-
CandidatesLcMcGen const& mcParticles)
1086+
CandidatesLcMcGen const& mcParticles)
10871087
{
10881088
doSameEventMcGen<false>(mcCollision, mcParticles);
10891089
}
10901090
PROCESS_SWITCH(HfCorrelatorLcScHadrons, processMcGenLc, "Process Mc Gen Lc mode", false);
10911091

1092-
void processMcGenSc(SelCollisionsMc::iterator const& mcCollision,
1093-
CandidatesScMcGen const& mcParticles)
1092+
void processMcGenSc(SelCollisionsMc::iterator const& mcCollision,
1093+
CandidatesScMcGen const& mcParticles)
10941094
{
10951095
doSameEventMcGen<true>(mcCollision, mcParticles);
10961096
}

PWGHF/HFC/Utils/utilsCorrelations.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "Common/DataModel/PIDResponseTPC.h"
2929
#include "Common/DataModel/PIDResponseTOF.h"
3030

31-
//HfHelper hfHelper;
31+
// HfHelper hfHelper;
3232

3333
namespace o2::analysis::hf_correlations
3434
{
@@ -126,7 +126,8 @@ bool passPIDSelection(Atrack const& track, SpeciesContainer const mPIDspecies,
126126
}
127127

128128
template <bool isScCand, typename McParticle>
129-
bool matchCandAndMass(McParticle const& particle, double& massCand) {
129+
bool matchCandAndMass(McParticle const& particle, double& massCand)
130+
{
130131
const auto pdgCand = std::abs(particle.pdgCode());
131132
const auto matchGenFlag = std::abs(particle.flagMcMatchGen());
132133

@@ -157,7 +158,7 @@ bool matchCandAndMass(McParticle const& particle, double& massCand) {
157158
case BIT(aod::hf_cand_sigmac::DecayType::ScplusplusToPKPiPi):
158159
massCand = o2::constants::physics::MassSigmaCStarPlusPlus;
159160
return true;
160-
161+
161162
case BIT(aod::hf_cand_sigmac::DecayType::ScStarPlusPlusToPKPiPi):
162163
massCand = o2::constants::physics::MassSigmaCStarPlusPlus;
163164
return true;

0 commit comments

Comments
 (0)