Skip to content

Commit 21e93a2

Browse files
christianreckziegelchristianreckziegel
committed
Merge remote-tracking branch 'origin/charm-hadronisation2' into charm-hadronisation2
2 parents 06859a4 + 4dcc306 commit 21e93a2

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

‎PWGJE/Tasks/hfFragmentationFunction.cxx‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -525,14 +525,14 @@ struct HfFragmentationFunction {
525525
}
526526
} else {
527527
// store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
528-
matchJetTable(jetutilities::deltaR(mcpjet, mcpcand), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.template tracks_as<aod::JetParticles>().size() + mcpjet.template candidates_as<TCandidatesMCP>().size(), // particle level jet
529-
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
530-
std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions, // MC collision selections
531-
-2, -2, -2, -2, -2, // no detector-level jet found
532-
-2, -2, -2, -2, -2, false, // no detector-level jet found
533-
-2, -2, -2, // no detector-level jet found
534-
-2, -2, // no detector-level jet found
535-
false, false); // no detector-level jet found
528+
matchJetTable(jetutilities::deltaR(mcpjet, mcpcand), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.template tracks_as<aod::JetParticles>().size() + mcpjet.template candidates_as<TCandidatesMCP>().size(), // particle level jet
529+
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
530+
std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions, // MC collision selections
531+
-2, -2, -2, -2, -2, // no detector-level jet found
532+
-2, -2, -2, -2, -2, false, // no detector-level jet found
533+
-2, -2, -2, // no detector-level jet found
534+
-2, -2, // no detector-level jet found
535+
false, false); // no detector-level jet found
536536
}
537537
} // end of mcpjets loop
538538

@@ -564,14 +564,14 @@ struct HfFragmentationFunction {
564564
}
565565

566566
// store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
567-
matchJetTable(-2, -2, -2, -2, -2, // particle level jet
568-
-2, -2, -2, -2, false, // particle level HF
569-
std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions, // MC collision selections
570-
jetutilities::deltaR(mcdjet, mcdcand), mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.template tracks_as<aod::JetTracks>().size() + mcdjet.template candidates_as<TCandidatesMCD>().size(), // detector level jet
571-
mcdcand.pt(), mcdcand.eta(), mcdcand.phi(), mcdcand.m(), mcdcand.y(), (mcdcand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level HF
572-
mcdcand.mlScores()[0], mcdcand.mlScores()[1], mcdcand.mlScores()[2], // Machine Learning PID scores: background, prompt, non-prompt
573-
static_cast<int>(mcdcand.flagMcMatchRec()), selectedAs, // HF = +1, HFbar = -1, neither = 0
574-
std::abs(collision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(collision, eventSelectionBits)); // Reconstructed collision selections
567+
matchJetTable(-2, -2, -2, -2, -2, // particle level jet
568+
-2, -2, -2, -2, false, // particle level HF
569+
std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions, // MC collision selections
570+
jetutilities::deltaR(mcdjet, mcdcand), mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.template tracks_as<aod::JetTracks>().size() + mcdjet.template candidates_as<TCandidatesMCD>().size(), // detector level jet
571+
mcdcand.pt(), mcdcand.eta(), mcdcand.phi(), mcdcand.m(), mcdcand.y(), (mcdcand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level HF
572+
mcdcand.mlScores()[0], mcdcand.mlScores()[1], mcdcand.mlScores()[2], // Machine Learning PID scores: background, prompt, non-prompt
573+
static_cast<int>(mcdcand.flagMcMatchRec()), selectedAs, // HF = +1, HFbar = -1, neither = 0
574+
std::abs(collision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(collision, eventSelectionBits)); // Reconstructed collision selections
575575
}
576576
} // end of non-matched detector level jets loop
577577
} // end of collisions loop

0 commit comments

Comments
 (0)