Skip to content

Commit f7689a6

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 61edc3d commit f7689a6

File tree

3 files changed

+46
-51
lines changed

3 files changed

+46
-51
lines changed

‎PWGCF/FemtoUniverse/Core/FemtoUniverseSoftPionRemoval.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class FemtoUniverseSoftPionRemoval
6868
const auto& negChild = particles.iteratorAt(part2.index() - 1);
6969

7070
// D* reconstruction
71-
double pSum2 = std::pow(posChild.px()+negChild.px()+part1.px(), 2.0) + std::pow(posChild.py()+negChild.py()+part1.py(), 2.0) + std::pow(posChild.pz()+negChild.pz()+part1.pz(), 2.0);
71+
double pSum2 = std::pow(posChild.px() + negChild.px() + part1.px(), 2.0) + std::pow(posChild.py() + negChild.py() + part1.py(), 2.0) + std::pow(posChild.pz() + negChild.pz() + part1.pz(), 2.0);
7272
// Energies of the daughters -> D0->K-pi+
7373
double e1Pi = std::sqrt(std::pow(MassPiPlus, 2.0) + std::pow(posChild.px(), 2.0) + std::pow(posChild.py(), 2.0) + std::pow(posChild.pz(), 2.0));
7474
double e1K = std::sqrt(std::pow(MassKPlus, 2.0) + std::pow(negChild.px(), 2.0) + std::pow(negChild.py(), 2.0) + std::pow(negChild.pz(), 2.0));
@@ -83,21 +83,21 @@ class FemtoUniverseSoftPionRemoval
8383

8484
bool isSoftPion = false;
8585
double softPiMass = 0.14542; // pion mass in D*->D0pi decay
86-
double lowMassLimitSoftPion = softPiMass - 3.0*sigma;
87-
double highMassLimitSoftPion = softPiMass + 3.0*sigma;
86+
double lowMassLimitSoftPion = softPiMass - 3.0 * sigma;
87+
double highMassLimitSoftPion = softPiMass + 3.0 * sigma;
8888

8989
if (isD0Cand) {
90-
if (mDstar1-part2.mLambda() > 0.) {
91-
mHistogramRegistry->fill(HIST("SoftPion/softPionMassVsPt"), mDstar1-part2.mLambda(), part2.pt());
90+
if (mDstar1 - part2.mLambda() > 0.) {
91+
mHistogramRegistry->fill(HIST("SoftPion/softPionMassVsPt"), mDstar1 - part2.mLambda(), part2.pt());
9292
}
9393
if ((std::abs(mDstar1 - part2.mLambda()) > lowMassLimitSoftPion) && (std::abs(mDstar1 - part2.mLambda()) < highMassLimitSoftPion)) {
9494
isSoftPion = true;
9595
}
9696
}
9797

9898
if (isD0barCand) {
99-
if (mDstar2-part2.mAntiLambda() > 0.) {
100-
mHistogramRegistry->fill(HIST("SoftPion/softPionMassVsPt"), mDstar2-part2.mAntiLambda(), part2.pt());
99+
if (mDstar2 - part2.mAntiLambda() > 0.) {
100+
mHistogramRegistry->fill(HIST("SoftPion/softPionMassVsPt"), mDstar2 - part2.mAntiLambda(), part2.pt());
101101
}
102102
if ((std::abs(mDstar2 - part2.mAntiLambda()) > lowMassLimitSoftPion) && (std::abs(mDstar2 - part2.mAntiLambda()) < highMassLimitSoftPion)) {
103103
isSoftPion = true;

‎PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ struct FemtoUniverseProducerTask {
701701
particle.mlProbD0()[0], // getter decayVtxX
702702
particle.mlProbD0()[1], // getter decayVtxY
703703
particle.mlProbD0()[2], // getter decayVtxZ
704-
-999.); // Additional info for D0/D0bar
704+
-999.); // Additional info for D0/D0bar
705705
} else if constexpr (isD0barML) {
706706
outputDebugParts(-999., -999., -999., -999., -999., -999., -999., -999., -999.,
707707
-999., -999., -999., -999., -999., -999., -999., -999.,
@@ -710,7 +710,7 @@ struct FemtoUniverseProducerTask {
710710
particle.mlProbD0bar()[0], // getter decayVtxX
711711
particle.mlProbD0bar()[1], // getter decayVtxY
712712
particle.mlProbD0bar()[2], // getter decayVtxZ
713-
-999.); // Additional info for D0/D0bar
713+
-999.); // Additional info for D0/D0bar
714714
} else {
715715
outputDebugParts(-999., -999., -999., -999., -999., -999., -999., -999., -999.,
716716
-999., -999., -999., -999., -999., -999., -999., -999.,
@@ -817,26 +817,21 @@ struct FemtoUniverseProducerTask {
817817
if (hfCand.isSelD0() == 1 && hfCand.isSelD0bar() == 0) {
818818
hfCandOrigin = aod::femtouniverse_mc_particle::ParticleOriginMCTruth::kPrompt;
819819
pdgCode = 421;
820-
}
821-
else if (hfCand.isSelD0() == 0 && hfCand.isSelD0bar() == 1) {
820+
} else if (hfCand.isSelD0() == 0 && hfCand.isSelD0bar() == 1) {
822821
hfCandOrigin = aod::femtouniverse_mc_particle::ParticleOriginMCTruth::kPrompt;
823822
pdgCode = -421;
824-
}
825-
else {
823+
} else {
826824
hfCandOrigin = aod::femtouniverse_mc_particle::ParticleOriginMCTruth::kFake;
827825
pdgCode = 0;
828826
}
829-
}
830-
else {
827+
} else {
831828
if (hfCand.isSelD0() == 1 && hfCand.isSelD0bar() == 0) {
832829
hfCandOrigin = aod::femtouniverse_mc_particle::ParticleOriginMCTruth::kNonPrompt;
833830
pdgCode = 421;
834-
}
835-
else if (hfCand.isSelD0() == 0 && hfCand.isSelD0bar() == 1) {
831+
} else if (hfCand.isSelD0() == 0 && hfCand.isSelD0bar() == 1) {
836832
hfCandOrigin = aod::femtouniverse_mc_particle::ParticleOriginMCTruth::kNonPrompt;
837833
pdgCode = -421;
838-
}
839-
else {
834+
} else {
840835
hfCandOrigin = aod::femtouniverse_mc_particle::ParticleOriginMCTruth::kFake;
841836
pdgCode = 0;
842837
}
@@ -1519,8 +1514,8 @@ struct FemtoUniverseProducerTask {
15191514
hfCand.eta(),
15201515
hfCand.phi(),
15211516
aod::femtouniverseparticle::ParticleType::kD0,
1522-
-999, // cut, CutContainerType
1523-
-999, // PID, CutContainerType
1517+
-999, // cut, CutContainerType
1518+
-999, // PID, CutContainerType
15241519
mlProbD0D0barBg, // saving the probability for ML score class 1
15251520
indexChildID,
15261521
invMassD0, // D0 mass (mLambda)
@@ -1529,8 +1524,8 @@ struct FemtoUniverseProducerTask {
15291524
if (confIsDebug) {
15301525
fillDebugParticle<false, true, false>(postrack); // QA for positive daughter
15311526
fillDebugParticle<false, true, false>(negtrack); // QA for negative daughter
1532-
if(hfCand.isSelD0() == 1 && hfCand.isSelD0bar() == 0) {
1533-
fillDebugD0D0barML<true, false>(hfCand); // QA for D0/D0bar
1527+
if (hfCand.isSelD0() == 1 && hfCand.isSelD0bar() == 0) {
1528+
fillDebugD0D0barML<true, false>(hfCand); // QA for D0/D0bar
15341529
} else if (hfCand.isSelD0() == 0 && hfCand.isSelD0bar() == 1) {
15351530
fillDebugD0D0barML<false, true>(hfCand);
15361531
} else {
@@ -2201,12 +2196,12 @@ struct FemtoUniverseProducerTask {
22012196

22022197
Preslice<soa::Join<aod::HfCand2Prong, aod::HfCand2ProngMcRec, aod::HfSelD0, aod::HfMlD0>> perCollisionD0s = aod::track::collisionId;
22032198
void processTrackD0MC(aod::McCollisions const& mccols,
2204-
aod::TracksWMc const&,
2205-
soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::McCollisionLabels> const& collisions,
2206-
soa::Filtered<soa::Join<aod::FemtoFullTracks, aod::McTrackLabels>> const& tracks,
2207-
soa::Join<aod::McParticles, aod::HfCand2ProngMcGen> const& hfMcGenCands,
2208-
soa::Join<aod::HfCand2Prong, aod::HfCand2ProngMcRec, aod::HfSelD0, aod::HfMlD0> const& hfMcRecoCands,
2209-
aod::BCsWithTimestamps const&)
2199+
aod::TracksWMc const&,
2200+
soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::McCollisionLabels> const& collisions,
2201+
soa::Filtered<soa::Join<aod::FemtoFullTracks, aod::McTrackLabels>> const& tracks,
2202+
soa::Join<aod::McParticles, aod::HfCand2ProngMcGen> const& hfMcGenCands,
2203+
soa::Join<aod::HfCand2Prong, aod::HfCand2ProngMcRec, aod::HfSelD0, aod::HfMlD0> const& hfMcRecoCands,
2204+
aod::BCsWithTimestamps const&)
22102205
{
22112206
// MC Reco
22122207
std::set<int> recoMcIds;
@@ -2219,18 +2214,18 @@ struct FemtoUniverseProducerTask {
22192214
const auto colcheck = fillCollisions<true>(col, tracks);
22202215
if (colcheck) {
22212216
fillTracks<true>(tracks);
2222-
fillD0D0barUsingML<true>(col, groupedTracks, groupedD0s);
2223-
for (const auto& track : groupedTracks) {
2224-
if (trackCuts.isSelectedMinimal(track))
2225-
recoMcIds.insert(track.mcParticleId());
2226-
}
2217+
fillD0D0barUsingML<true>(col, groupedTracks, groupedD0s);
2218+
for (const auto& track : groupedTracks) {
2219+
if (trackCuts.isSelectedMinimal(track))
2220+
recoMcIds.insert(track.mcParticleId());
2221+
}
22272222
}
22282223
}
22292224
// MC Truth
22302225
for (const auto& mccol : mccols) {
22312226
auto groupedMCParticles = hfMcGenCands.sliceBy(perMCCollision, mccol.globalIndex());
22322227
auto groupedCollisions = collisions.sliceBy(recoCollsPerMCColl, mccol.globalIndex());
2233-
fillMCTruthCollisions(groupedCollisions, groupedMCParticles); // fills the reco collisions for mc collision
2228+
fillMCTruthCollisions(groupedCollisions, groupedMCParticles); // fills the reco collisions for mc collision
22342229
fillMCTruthParticlesD0<decltype(groupedMCParticles), true, true>(groupedMCParticles, recoMcIds); // fills mc particles
22352230
}
22362231
}

‎PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackD0.cxx‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ struct FemtoUniversePairTaskTrackD0 {
122122
Configurable<float> minInvMassD0D0barLeftSB{"minInvMassD0D0barLeftSB", 1.65, "Min. inv. mass of D0/D0bar for left SB region"};
123123
Configurable<float> maxInvMassD0D0barLeftSB{"maxInvMassD0D0barLeftSB", 1.754, "Max. inv. mass of D0/D0bar for left SB region"};
124124
Configurable<float> minInvMassD0D0barRightSB{"minInvMassD0D0barRightSB", 1.978, "Min. inv. mass of D0/D0bar for right SB region"};
125-
Configurable<float> maxInvMassD0D0barRightSB{"maxInvMassD0D0barRightSB", 2.09,"Max. inv. mass of D0/D0bar for right SB region"};
125+
Configurable<float> maxInvMassD0D0barRightSB{"maxInvMassD0D0barRightSB", 2.09, "Max. inv. mass of D0/D0bar for right SB region"};
126126
} ConfDmesons;
127127

128128
struct : o2::framework::ConfigurableGroup {
@@ -139,7 +139,7 @@ struct FemtoUniversePairTaskTrackD0 {
139139

140140
Configurable<std::vector<double>> binsPt{"binsPt", std::vector<double>{hf_cuts_d0_to_pi_k::vecBinsPt}, "pT bin limits"};
141141
Configurable<uint8_t> confChooseD0trackCorr{"confChooseD0trackCorr", 0, "If 0 correlations with D0s, if 1 with D0bars"};
142-
142+
143143
// Efficiency
144144
struct : o2::framework::ConfigurableGroup {
145145
Configurable<std::string> confEfficiencyTrackPath{"confEfficiencyTrackPath", "", "Local path to hadron efficiency TH2F file"};
@@ -549,7 +549,7 @@ struct FemtoUniversePairTaskTrackD0 {
549549
if (charmCand.mLambda() > 0.0f && charmCand.mAntiLambda() < 0.0f) {
550550
if (charmCand.tempFitVar() < ConfMlOpt.confClass1BgProbStart)
551551
registry.fill(HIST("D0D0bar_MLSel/hMassVsPt1"), charmCand.mLambda(), charmCand.pt());
552-
if (charmCand.tempFitVar() < ConfMlOpt.confClass1BgProbStart + ConfMlOpt.confClass1BgProbStep )
552+
if (charmCand.tempFitVar() < ConfMlOpt.confClass1BgProbStart + ConfMlOpt.confClass1BgProbStep)
553553
registry.fill(HIST("D0D0bar_MLSel/hMassVsPt2"), charmCand.mLambda(), charmCand.pt());
554554
if (charmCand.tempFitVar() < ConfMlOpt.confClass1BgProbStart + 2.0 * ConfMlOpt.confClass1BgProbStep)
555555
registry.fill(HIST("D0D0bar_MLSel/hMassVsPt3"), charmCand.mLambda(), charmCand.pt());
@@ -745,8 +745,8 @@ struct FemtoUniversePairTaskTrackD0 {
745745
}
746746
}
747747
// Soft Pion Removal
748-
if(confRemoveSoftPions) {
749-
if(softPionRemoval.isSoftPion(track, d0candidate, parts, confSoftPionD0Flag, confSoftPionD0barFlag, sigmaSoftPiInvMass)) {
748+
if (confRemoveSoftPions) {
749+
if (softPionRemoval.isSoftPion(track, d0candidate, parts, confSoftPionD0Flag, confSoftPionD0barFlag, sigmaSoftPiInvMass)) {
750750
continue;
751751
}
752752
}
@@ -800,7 +800,7 @@ struct FemtoUniversePairTaskTrackD0 {
800800

801801
auto groupPartsTrack = partsTrack->sliceByCached(aod::femtouniverseparticle::fdCollisionId, col.globalIndex(), cache);
802802
auto groupPartsD0sFromSB = partsD0sFromSB->sliceByCached(aod::femtouniverseparticle::fdCollisionId, col.globalIndex(), cache);
803-
803+
804804
doSameEvent<false>(groupPartsTrack, groupPartsD0sFromSB, parts, col.magField(), col.multNtr());
805805
}
806806
PROCESS_SWITCH(FemtoUniversePairTaskTrackD0, processSameEventSB, "Enable processing same event", true);
@@ -843,8 +843,8 @@ struct FemtoUniversePairTaskTrackD0 {
843843
}
844844
}
845845
// // Soft Pion Removal
846-
if(confRemoveSoftPions) {
847-
if(softPionRemoval.isSoftPion(track, d0candidate, parts, confSoftPionD0Flag, confSoftPionD0barFlag, sigmaSoftPiInvMass)) {
846+
if (confRemoveSoftPions) {
847+
if (softPionRemoval.isSoftPion(track, d0candidate, parts, confSoftPionD0Flag, confSoftPionD0barFlag, sigmaSoftPiInvMass)) {
848848
continue;
849849
}
850850
}
@@ -988,26 +988,26 @@ struct FemtoUniversePairTaskTrackD0 {
988988
mcTruthRegistry.fill(HIST("MCTruthAllPositivePt"), part.pt());
989989
}
990990
if (pdgCode == 321) {
991-
//mcTruthRegistry.fill(HIST("MCtruthKp"), part.pt(), part.eta());
992-
//mcTruthRegistry.fill(HIST("MCtruthKpPt"), part.pt());
991+
// mcTruthRegistry.fill(HIST("MCtruthKp"), part.pt(), part.eta());
992+
// mcTruthRegistry.fill(HIST("MCtruthKpPt"), part.pt());
993993
}
994994
if (pdgCode == 333) {
995-
//mcTruthRegistry.fill(HIST("MCtruthPhi"), part.pt(), part.eta());
996-
//continue;
995+
// mcTruthRegistry.fill(HIST("MCtruthPhi"), part.pt(), part.eta());
996+
// continue;
997997
}
998998
if (pdgCode == 2212) {
999-
//mcTruthRegistry.fill(HIST("MCtruthPpos"), part.pt(), part.eta());
999+
// mcTruthRegistry.fill(HIST("MCtruthPpos"), part.pt(), part.eta());
10001000
}
10011001

10021002
if (pdgParticle->Charge() < 0.0) {
10031003
mcTruthRegistry.fill(HIST("MCTruthAllNegativePt"), part.pt());
10041004
}
10051005
if (pdgCode == -321) {
1006-
//mcTruthRegistry.fill(HIST("MCtruthKm"), part.pt(), part.eta());
1007-
//mcTruthRegistry.fill(HIST("MCtruthKmPt"), part.pt());
1006+
// mcTruthRegistry.fill(HIST("MCtruthKm"), part.pt(), part.eta());
1007+
// mcTruthRegistry.fill(HIST("MCtruthKmPt"), part.pt());
10081008
}
10091009
if (pdgCode == -2212) {
1010-
//mcTruthRegistry.fill(HIST("MCtruthPneg"), part.pt(), part.eta());
1010+
// mcTruthRegistry.fill(HIST("MCtruthPneg"), part.pt(), part.eta());
10111011
}
10121012
}
10131013
}

0 commit comments

Comments
 (0)