Skip to content

Please consider the following formatting changes to #12451 #30

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
Aug 5, 2025
Merged

Please consider the following formatting changes to #12451 #30

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
7 changes: 3 additions & 4 deletions PWGHF/D2H/DataModel/ReducedDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,7 @@ DECLARE_SOA_TABLE(HfRedSoftPiPid, "AOD", "HFREDSOFTPIPID",
hf_track_vars_reduced::HasTOF,
hf_track_vars_reduced::HasTPC,
hf_cand_dstar::TPCTOFNSigmaPiSoftPi<hf_cand_dstar::TPCNSigmaPiSoftPi, hf_cand_dstar::TOFNSigmaPiSoftPi>,
hf_cand_dstar::TPCTOFNSigmaKaSoftPi<hf_cand_dstar::TPCNSigmaKaSoftPi, hf_cand_dstar::TOFNSigmaKaSoftPi>
)
hf_cand_dstar::TPCTOFNSigmaKaSoftPi<hf_cand_dstar::TPCNSigmaKaSoftPi, hf_cand_dstar::TOFNSigmaKaSoftPi>)

namespace hf_track_index_reduced
{
Expand All @@ -568,7 +567,7 @@ DECLARE_SOA_INDEX_COLUMN_FULL(SoftPi, softPi, int, HfRedSoftPiBases, ""); //! Re
// to call DECLARE_SOA_INDEX_COLUMN_FULL later on
DECLARE_SOA_TABLE(HfRedDStars, "AOD", "HFREDDSTAR", //! Table with 2prong candidate information for reduced workflow
o2::soa::Index<>,
hf_track_index_reduced::Prong0Id, hf_track_index_reduced::Prong1Id, hf_track_index_reduced::Prong2Id,
hf_track_index_reduced::Prong0Id, hf_track_index_reduced::Prong1Id, hf_track_index_reduced::Prong2Id,
hf_track_index_reduced::SoftPiId, hf_track_index_reduced::HfRedCollisionId,
HFTRACKPAR_COLUMNS,
hf_cand::XSecondaryVertex, hf_cand::YSecondaryVertex, hf_cand::ZSecondaryVertex,
Expand Down Expand Up @@ -767,7 +766,7 @@ namespace hf_cand_b0_reduced
{
DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3Prongs, "_0"); //! Prong0 index
DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrackBases, "_1"); //! Prong1 index
DECLARE_SOA_INDEX_COLUMN_FULL(ProngDStar, prongDStar, int, HfRedDStars, ""); //! ProngDStar index
DECLARE_SOA_INDEX_COLUMN_FULL(ProngDStar, prongDStar, int, HfRedDStars, ""); //! ProngDStar index
DECLARE_SOA_INDEX_COLUMN_FULL(ProngSoftPi, prongSoftPi, int, HfRedB0SoftPi, ""); //! ProngSoftPi index
DECLARE_SOA_COLUMN(Prong0MlScoreBkg, prong0MlScoreBkg, float); //! Bkg ML score of the D daughter
DECLARE_SOA_COLUMN(Prong0MlScorePrompt, prong0MlScorePrompt, float); //! Prompt ML score of the D daughter
Expand Down
13 changes: 6 additions & 7 deletions PWGHF/D2H/TableProducer/candidateCreatorB0Reduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
df3.setUseAbsDCA(useAbsDCA);
df3.setWeightedFinalPCA(useWeightedFinalPCA);


// histograms
if (doprocessDataDplusPi || doprocessDataDplusPiWithDmesMl) {
registry.add("hMassB0ToDPi", "2-prong candidates;inv. mass (B^{0} #rightarrow D^{#minus}#pi^{#plus} #rightarrow #pi^{#minus}K^{#plus}#pi^{#minus}#pi^{#plus}) (GeV/#it{c}^{2});entries", {HistType::kTH1F, {{500, 3., 8.}}});
Expand All @@ -145,10 +144,10 @@
/// \param invMass2DPiMax maximum B0 invariant-mass
template <bool withDmesMl, typename Cands, typename Pions, typename Coll>
void runCandidateCreationDStar(Coll const& collision,
Cands const& candsDThisColl,
Pions const& tracksPionThisCollision,
const float& invMass2DPiMin,
const float& invMass2DPiMax)
Cands const& candsDThisColl,
Pions const& tracksPionThisCollision,
const float& invMass2DPiMin,
const float& invMass2DPiMax)
{
auto primaryVertex = getPrimaryVertex(collision);
auto covMatrixPV = primaryVertex.getCov();
Expand All @@ -164,7 +163,7 @@
std::array<float, 3> pVecSoftPi = softPi.pVector();
auto trackParCovSoftPi = getTrackParCov(softPi);
std::array<float, 3> pVecD = RecoDecay::sumOfVec(pVecD0, pVecSoftPi);

for (const auto& trackPion : tracksPionThisCollision) {
// this track is among daughters
if (trackPion.trackId() == candD.prong0Id() || trackPion.trackId() == candD.prong1Id() || trackPion.trackId() == candD.prong2Id()) {
Expand All @@ -173,7 +172,7 @@

auto trackParCovPi = getTrackParCov(trackPion);
std::array<float, 3> pVecPion = trackPion.pVector();

// compute invariant mass square and apply selection
auto invMass2DPi = RecoDecay::m2(std::array{pVecD, pVecSoftPi, pVecPion}, std::array{massDstar, massPi, massPi});
if ((invMass2DPi < invMass2DPiMin) || (invMass2DPi > invMass2DPiMax)) {
Expand Down Expand Up @@ -380,7 +379,7 @@
auto candsDThisColl = candsD.sliceBy(candsDplusPerCollision, thisCollId);
auto tracksPionThisCollision = tracksPion.sliceBy(tracksPionPerCollision, thisCollId);
runCandidateCreation<false>(collision, candsDThisColl, tracksPionThisCollision, invMass2DPiMin, invMass2DPiMax);
if (ncol % 10000 == 0) {

Check failure on line 382 in PWGHF/D2H/TableProducer/candidateCreatorB0Reduced.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
LOGP(debug, "collisions parsed {}", ncol);
}
ncol++;
Expand Down Expand Up @@ -414,7 +413,7 @@
auto candsDThisColl = candsD.sliceBy(candsDplusPerCollision, thisCollId);
auto tracksPionThisCollision = tracksPion.sliceBy(tracksPionPerCollision, thisCollId);
runCandidateCreation<true>(collision, candsDThisColl, tracksPionThisCollision, invMass2DPiMin, invMass2DPiMax);
if (ncol % 10000 == 0) {

Check failure on line 416 in PWGHF/D2H/TableProducer/candidateCreatorB0Reduced.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
LOGP(debug, "collisions parsed {}", ncol);
}
ncol++;
Expand Down Expand Up @@ -449,7 +448,7 @@
auto candsDThisColl = candsD.sliceBy(candsDstarPerCollision, thisCollId);
auto tracksPionThisCollision = tracksPion.sliceBy(tracksPionPerCollision, thisCollId);
runCandidateCreationDStar<false>(collision, candsDThisColl, tracksPionThisCollision, invMass2DPiMin, invMass2DPiMax);
if (ncol % 10000 == 0) {

Check failure on line 451 in PWGHF/D2H/TableProducer/candidateCreatorB0Reduced.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
LOGP(debug, "collisions parsed {}", ncol);
}
ncol++;
Expand Down Expand Up @@ -484,7 +483,7 @@
auto candsDThisColl = candsD.sliceBy(candsDstarPerCollision, thisCollId);
auto tracksPionThisCollision = tracksPion.sliceBy(tracksPionPerCollision, thisCollId);
runCandidateCreationDStar<true>(collision, candsDThisColl, tracksPionThisCollision, invMass2DPiMin, invMass2DPiMax);
if (ncol % 10000 == 0) {

Check failure on line 486 in PWGHF/D2H/TableProducer/candidateCreatorB0Reduced.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
LOGP(debug, "collisions parsed {}", ncol);
}
ncol++;
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ struct HfDataCreatorCharmHadPiReduced {
tables.hfCand2ProngMl(mlScores[0], mlScores[1], mlScores[2], mlScores[3], mlScores[4], mlScores[5]);
}
} else if constexpr (decChannel == DecayChannel::B0ToDstarPi) {
tables.hfCandDStar(charmHadDauTracks[0].globalIndex(), charmHadDauTracks[1].globalIndex(), charmHadDauTracks[2].globalIndex(),
tables.hfCandDStar(charmHadDauTracks[0].globalIndex(), charmHadDauTracks[1].globalIndex(), charmHadDauTracks[2].globalIndex(),
indexHfCandCharm, indexHfReducedCollision,
trackParCovCharmHad.getX(), trackParCovCharmHad.getAlpha(),
trackParCovCharmHad.getY(), trackParCovCharmHad.getZ(), trackParCovCharmHad.getSnp(),
Expand Down
8 changes: 4 additions & 4 deletions PWGHF/D2H/Tasks/taskB0Reduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ struct HfTaskB0Reduced {

void init(InitContext&)
{
std::array<bool, 6> processFuncData{doprocessDataDplusPi, doprocessDataDplusPiWithDmesMl, doprocessDataDplusPiWithB0Ml,
std::array<bool, 6> processFuncData{doprocessDataDplusPi, doprocessDataDplusPiWithDmesMl, doprocessDataDplusPiWithB0Ml,
doprocessDataDstarPi, doprocessDataDstarPiWithDmesMl};
if ((std::accumulate(processFuncData.begin(), processFuncData.end(), 0)) > 1) {
LOGP(fatal, "Only one process function for data can be enabled at a time.");
Expand All @@ -228,9 +228,9 @@ struct HfTaskB0Reduced {
const AxisSpec axisPtPi{100, 0.f, 10.f};

std::string dMesSpecie{""};
std::array<bool, 9> processFuncDplusPi = {doprocessDataDplusPi, doprocessDataDplusPiWithDmesMl, doprocessDataDplusPiWithB0Ml,
doprocessMcDplusPi, doprocessMcDplusPiWithDecayTypeCheck, doprocessMcDplusPiWithDmesMl,
doprocessMcDplusPiWithDmesMlAndDecayTypeCheck, doprocessMcDplusPiWithB0Ml,
std::array<bool, 9> processFuncDplusPi = {doprocessDataDplusPi, doprocessDataDplusPiWithDmesMl, doprocessDataDplusPiWithB0Ml,
doprocessMcDplusPi, doprocessMcDplusPiWithDecayTypeCheck, doprocessMcDplusPiWithDmesMl,
doprocessMcDplusPiWithDmesMlAndDecayTypeCheck, doprocessMcDplusPiWithB0Ml,
doprocessMcDplusPiWithB0MlAndDecayTypeCheck};
if ((std::accumulate(processFuncDplusPi.begin(), processFuncDplusPi.end(), 0)) > 1) {
dMesSpecie += "D^{#minus}";
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 @@ -2240,7 +2240,7 @@ DECLARE_SOA_TABLE(HfCandB0Base, "AOD", "HFCANDB0BASE",
// extended table with expression columns that can be used as arguments of dynamic columns
DECLARE_SOA_EXTENDED_TABLE_USER(HfCandB0Ext, HfCandB0Base, "HFCANDB0EXT",
hf_cand_2prong::Px, hf_cand_2prong::Py, hf_cand_2prong::Pz);

DECLARE_SOA_TABLE(HfCandB0Prongs, "AOD", "HFCANDB0PRONGS",
hf_cand_b0::Prong0Id, hf_track_index::Prong1Id);

Expand Down
Loading