Skip to content

Commit 824f74b

Browse files
Merge pull request #1 from alibuild/alibot-cleanup-8163
Please consider the following formatting changes to #8163
2 parents a842cff + 1d38173 commit 824f74b

1 file changed

Lines changed: 14 additions & 15 deletions

File tree

PWGJE/Tasks/hffragmentationfunction.cxx

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ struct HfFragmentationFunctionTask {
328328

329329
if (mcdd0cand.flagMcMatchRec() == decayChannel) { // matched to D0 on truth level
330330
matchedFrom = 1;
331-
if (!mcdd0cand.candidateSelFlag()) { //CandidateSelFlag == 0 -> selected as D0, CandidateSelFlag == 1 -> selected as D0bar
331+
if (!mcdd0cand.candidateSelFlag()) { // CandidateSelFlag == 0 -> selected as D0, CandidateSelFlag == 1 -> selected as D0bar
332332
selectedAs = 1;
333333
}
334334
} else if (mcdd0cand.flagMcMatchRec() == -decayChannel) { // matched to D0bar on truth level
@@ -348,7 +348,7 @@ struct HfFragmentationFunctionTask {
348348
mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.tracks_as<JetTracks>().size(), // detector level jet
349349
mcdd0cand.pt(), mcdd0cand.eta(), mcdd0cand.phi(), mcdd0cand.m(), mcdd0cand.y(), (mcdd0cand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level D0 candidate
350350
mcdjet.has_matchedJetCand(), mcdd0cand.mlScores()[0], mcdd0cand.mlScores()[1], mcdd0cand.mlScores()[2], // ML scores for bkg, prompt and non-prompt
351-
matchedFrom,selectedAs); // check whether detector level candidate is a reflection
351+
matchedFrom, selectedAs); // check whether detector level candidate is a reflection
352352
}
353353
}
354354

@@ -365,7 +365,6 @@ struct HfFragmentationFunctionTask {
365365
registry.fill(HIST("h_jet_counter"), 1.0);
366366
}
367367

368-
369368
// store data in MC detector level table (calculate angular distance in eta-phi plane on the fly)
370369
mcpdistJetTable(RecoDecay::sqrtSumOfSquares(mcpjet.eta() - mcpd0cand.eta(), deltaPhi(mcpjet.phi(), mcpd0cand.phi())),
371370
mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.tracks_as<JetParticles>().size(), // particle level jet
@@ -377,13 +376,13 @@ struct HfFragmentationFunctionTask {
377376
PROCESS_SWITCH(HfFragmentationFunctionTask, processMcEfficiency, "non-matched and matched MC HF and jets", false);
378377

379378
void processMcChargedMatched(JetMcCollisions const& mccollisions,
380-
JetCollisionsMCD const& collisions,
381-
JetMCDTable const& mcdjets,
382-
JetMCPTable const& mcpjets,
383-
CandidatesD0MCD const&,
384-
CandidatesD0MCP const&,
385-
JetTracks const&,
386-
JetParticles const&)
379+
JetCollisionsMCD const& collisions,
380+
JetMCDTable const& mcdjets,
381+
JetMCPTable const& mcpjets,
382+
CandidatesD0MCD const&,
383+
CandidatesD0MCP const&,
384+
JetTracks const&,
385+
JetParticles const&)
387386
{
388387
for (const auto& mccollision : mccollisions) {
389388

@@ -425,7 +424,7 @@ struct HfFragmentationFunctionTask {
425424

426425
if (mcdd0cand.flagMcMatchRec() == decayChannel) { // matched to D0 on truth level
427426
matchedFrom = 1;
428-
if (!mcdd0cand.candidateSelFlag()) { //CandidateSelFlag == 0 -> selected as D0, CandidateSelFlag == 1 -> selected as D0bar
427+
if (!mcdd0cand.candidateSelFlag()) { // CandidateSelFlag == 0 -> selected as D0, CandidateSelFlag == 1 -> selected as D0bar
429428
selectedAs = 1;
430429
}
431430
} else if (mcdd0cand.flagMcMatchRec() == -decayChannel) { // matched to D0bar on truth level
@@ -449,10 +448,10 @@ struct HfFragmentationFunctionTask {
449448
auto mcpd0cand = mcpjet.candidates_first_as<CandidatesD0MCP>();
450449

451450
// store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
452-
matchJetTable(RecoDecay::sqrtSumOfSquares(mcpjet.eta() - mcpd0cand.eta(), deltaPhi(mcpjet.phi(), mcpd0cand.phi())), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.tracks_as<JetParticles>().size(), // particle level jet
453-
mcpd0cand.pt(), mcpd0cand.eta(), mcpd0cand.phi(), mcpd0cand.y(), (mcpd0cand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level D0
454-
RecoDecay::sqrtSumOfSquares(mcdjet.eta() - mcdd0cand.eta(), deltaPhi(mcdjet.phi(), mcdd0cand.phi())), mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.tracks_as<JetTracks>().size(), // detector level jet
455-
mcdd0cand.pt(), mcdd0cand.eta(), mcdd0cand.phi(), mcdd0cand.m(), mcdd0cand.y(), (mcdd0cand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level D0
451+
matchJetTable(RecoDecay::sqrtSumOfSquares(mcpjet.eta() - mcpd0cand.eta(), deltaPhi(mcpjet.phi(), mcpd0cand.phi())), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.tracks_as<JetParticles>().size(), // particle level jet
452+
mcpd0cand.pt(), mcpd0cand.eta(), mcpd0cand.phi(), mcpd0cand.y(), (mcpd0cand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level D0
453+
RecoDecay::sqrtSumOfSquares(mcdjet.eta() - mcdd0cand.eta(), deltaPhi(mcdjet.phi(), mcdd0cand.phi())), mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.tracks_as<JetTracks>().size(), // detector level jet
454+
mcdd0cand.pt(), mcdd0cand.eta(), mcdd0cand.phi(), mcdd0cand.m(), mcdd0cand.y(), (mcdd0cand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level D0
456455
mcdd0cand.mlScores()[0], mcdd0cand.mlScores()[1], mcdd0cand.mlScores()[2],
457456
matchedFrom, selectedAs);
458457
}

0 commit comments

Comments
 (0)