Skip to content

Please consider the following formatting changes to #12111 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marcellocosti merged 1 commit into from
Jul 17, 2025
Merged

Please consider the following formatting changes to #12111 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion PWGHF/D2H/DataModel/ReducedDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ DECLARE_SOA_TABLE(HfRedSoftPiCov, "AOD", "HFREDSOFTPICOV", //! Table with track
HFTRACKPARCOV_COLUMNS,
o2::soa::Marker<2>);


// CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description)
// to call DECLARE_SOA_INDEX_COLUMN_FULL later on
DECLARE_SOA_TABLE(HfRedBach0Bases, "AOD", "HFREDBACH0BASE", //! Table with track information for reduced workflow
Expand Down
42 changes: 21 additions & 21 deletions PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,10 @@ struct HfDataCreatorCharmHadPiReduced {

// init HF event selection helper
hfEvSel.init(registry);
if (doprocessDplusPiMc || doprocessDplusPiMcWithMl ||
doprocessDsPiMc || doprocessDsPiMcWithMl ||
doprocessD0PiMc || doprocessD0PiMcWithMl ||
doprocessLcPiMc || doprocessLcPiMcWithMl ||
if (doprocessDplusPiMc || doprocessDplusPiMcWithMl ||
doprocessDsPiMc || doprocessDsPiMcWithMl ||
doprocessD0PiMc || doprocessD0PiMcWithMl ||
doprocessLcPiMc || doprocessLcPiMcWithMl ||
doprocessDstarPiMc || doprocessDstarPiMcWithMl) {
const auto& workflows = initContext.services().get<RunningWorkflowInfo const>();
for (const DeviceSpec& device : workflows.devices) {
Expand Down Expand Up @@ -1218,8 +1218,8 @@ struct HfDataCreatorCharmHadPiReduced {
trackParCovCharmHad = df2.createParentTrackParCov();
trackParCovCharmHad.setAbsCharge(0); // to be sure
} else if constexpr (decChannel == DecayChannel::B0ToDstarPi) {
hCandidatesDstar->Fill(SVFitting::BeforeFit);

hCandidatesDstar->Fill(SVFitting::BeforeFit);
try {
// D0 vertex
if (df2.process(trackParCov0, trackParCov1) == 0) {
Expand Down Expand Up @@ -1387,18 +1387,18 @@ struct HfDataCreatorCharmHadPiReduced {
}
} else if constexpr (decChannel == DecayChannel::BplusToD0barPi) { // D0(bar) → K± π∓
tables.hfCand2Prong(charmHadDauTracks[0].globalIndex(), charmHadDauTracks[1].globalIndex(),
indexHfReducedCollision,
trackParCovCharmHad.getX(), trackParCovCharmHad.getAlpha(),
trackParCovCharmHad.getY(), trackParCovCharmHad.getZ(), trackParCovCharmHad.getSnp(),
trackParCovCharmHad.getTgl(), trackParCovCharmHad.getQ2Pt(),
candC.xSecondaryVertex(), candC.ySecondaryVertex(), candC.zSecondaryVertex(), invMassC0, invMassC1,
ptDauMin, etaDauMin, nItsClsDauMin, nTpcCrossRowsDauMin, chi2TpcDauMax);
indexHfReducedCollision,
trackParCovCharmHad.getX(), trackParCovCharmHad.getAlpha(),
trackParCovCharmHad.getY(), trackParCovCharmHad.getZ(), trackParCovCharmHad.getSnp(),
trackParCovCharmHad.getTgl(), trackParCovCharmHad.getQ2Pt(),
candC.xSecondaryVertex(), candC.ySecondaryVertex(), candC.zSecondaryVertex(), invMassC0, invMassC1,
ptDauMin, etaDauMin, nItsClsDauMin, nTpcCrossRowsDauMin, chi2TpcDauMax);
tables.hfCand2ProngCov(trackParCovCharmHad.getSigmaY2(), trackParCovCharmHad.getSigmaZY(), trackParCovCharmHad.getSigmaZ2(),
trackParCovCharmHad.getSigmaSnpY(), trackParCovCharmHad.getSigmaSnpZ(),
trackParCovCharmHad.getSigmaSnp2(), trackParCovCharmHad.getSigmaTglY(), trackParCovCharmHad.getSigmaTglZ(),
trackParCovCharmHad.getSigmaTglSnp(), trackParCovCharmHad.getSigmaTgl2(),
trackParCovCharmHad.getSigma1PtY(), trackParCovCharmHad.getSigma1PtZ(), trackParCovCharmHad.getSigma1PtSnp(),
trackParCovCharmHad.getSigma1PtTgl(), trackParCovCharmHad.getSigma1Pt2());
trackParCovCharmHad.getSigmaSnpY(), trackParCovCharmHad.getSigmaSnpZ(),
trackParCovCharmHad.getSigmaSnp2(), trackParCovCharmHad.getSigmaTglY(), trackParCovCharmHad.getSigmaTglZ(),
trackParCovCharmHad.getSigmaTglSnp(), trackParCovCharmHad.getSigmaTgl2(),
trackParCovCharmHad.getSigma1PtY(), trackParCovCharmHad.getSigma1PtZ(), trackParCovCharmHad.getSigma1PtSnp(),
trackParCovCharmHad.getSigma1PtTgl(), trackParCovCharmHad.getSigma1Pt2());
tables.hfCandPidProng0(candC.nSigTpcPi0(), candC.nSigTofPi0(), candC.nSigTpcKa0(), candC.nSigTofKa0(), 0., 0., charmHadDauTracks[0].hasTOF(), charmHadDauTracks[0].hasTPC());
tables.hfCandPidProng1(candC.nSigTpcPi1(), candC.nSigTofPi1(), candC.nSigTpcKa1(), candC.nSigTofKa1(), 0., 0., charmHadDauTracks[1].hasTOF(), charmHadDauTracks[1].hasTPC());
if constexpr (withMl) {
Expand Down Expand Up @@ -1614,8 +1614,8 @@ struct HfDataCreatorCharmHadPiReduced {
counter++;
}
tables.rowHfBsMcGenReduced(flag, -1 /*channel*/, ptParticle, yParticle, etaParticle,
ptProngs[0], yProngs[0], etaProngs[0],
ptProngs[1], yProngs[1], etaProngs[1], hfRejMap, centFT0C, centFT0M);
ptProngs[0], yProngs[0], etaProngs[0],
ptProngs[1], yProngs[1], etaProngs[1], hfRejMap, centFT0C, centFT0M);
} else if constexpr (decayChannel == DecayChannel::BplusToD0barPi) {
// B+ → D0bar π+
if (RecoDecay::isMatchedMCGen(particlesMc, particle, Pdg::kBPlus, std::array{-static_cast<int>(Pdg::kD0), +kPiPlus}, true)) {
Expand Down Expand Up @@ -1647,8 +1647,8 @@ struct HfDataCreatorCharmHadPiReduced {
counter++;
}
tables.rowHfBpMcGenReduced(flag, -1 /*channel*/, ptParticle, yParticle, etaParticle,
ptProngs[0], yProngs[0], etaProngs[0],
ptProngs[1], yProngs[1], etaProngs[1], hfRejMap, centFT0C, centFT0M);
ptProngs[0], yProngs[0], etaProngs[0],
ptProngs[1], yProngs[1], etaProngs[1], hfRejMap, centFT0C, centFT0M);
} else if constexpr (decayChannel == DecayChannel::LbToLcplusPi) {
// Lb → Lc+ π-
if (RecoDecay::isMatchedMCGen<true>(particlesMc, particle, Pdg::kLambdaB0, std::array{static_cast<int>(Pdg::kLambdaCPlus), -kPiPlus}, true)) {
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/DataModel/CandidateReconstructionTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2192,7 +2192,7 @@ DECLARE_SOA_COLUMN(DebugMcRec, debugMcRec, int8_t); // debug fla

// mapping of decay types
enum DecayType { B0ToDPi = 0,
B0ToDstarPi};
B0ToDstarPi };

enum DecayTypeMc : uint8_t { B0ToDplusPiToPiKPiPi = 0,
B0ToDsPiToKKPiPi,
Expand Down
Loading