-
Notifications
You must be signed in to change notification settings - Fork 655
[PWGHF] Species-dependent minimum prong pt cut in skimming #15755
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.
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
Merged
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
b5be85c
Species-dependent min prong pt selection
be673b4
Please consider the following formatting changes
alibuild 6b29ee3
Implement Vit comments
Marcellocosti eb9bbf1
Implement Vit comments
Marcellocosti 89d23ad
Modify description
Marcellocosti eb1eb00
Fix configurable
Marcellocosti a2ebc3b
Implement Vit comments
Marcellocosti badc60e
Moved variable declaration
Marcellocosti 5445896
Add const qualifier
Marcellocosti 262986f
Fix capital letter
Marcellocosti a5323d4
Separate flag for prong min pt cut
Marcellocosti 2484924
Remove leftover comment
Marcellocosti c360e91
Update PWGHF/TableProducer/trackIndexSkimCreator.cxx
vkucera File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1456,6 +1456,9 @@ struct HfTrackIndexSkimCreator { | |
| Configurable<std::vector<double>> binsPtDstarToD0Pi{"binsPtDstarToD0Pi", std::vector<double>{hf_cuts_presel_dstar::vecBinsPt}, "pT bin limits for D*+->D0pi pT-dependent cuts"}; | ||
| Configurable<LabeledArray<double>> cutsDstarToD0Pi{"cutsDstarToD0Pi", {hf_cuts_presel_dstar::Cuts[0], hf_cuts_presel_dstar::NBinsPt, hf_cuts_presel_dstar::NCutVars, hf_cuts_presel_dstar::labelsPt, hf_cuts_presel_dstar::labelsCutVar}, "D*+->D0pi selections per pT bin"}; | ||
|
|
||
| // Species-differential track min pT selection for 3-prong candidates | ||
| Configurable<LabeledArray<float>> ptProngMin3Prong{"ptProngMin3Prong", {hf_cuts_presel_3prong::ptProngMin[0], hf_cuts_presel_3prong::NSpecies, 1, hf_cuts_presel_3prong::labelsPtProngMin, hf_cuts_presel_3prong::labelsMinPt}, "Min pT selection for prongs of 3-prong candidates in GeV/c"}; | ||
|
|
||
| // proton PID selections for Lc and Xic | ||
| Configurable<bool> applyProtonPidForLcToPKPi{"applyProtonPidForLcToPKPi", false, "Apply proton PID for Lc->pKpi"}; | ||
| Configurable<bool> applyProtonPidForXicToPKPi{"applyProtonPidForXicToPKPi", false, "Apply proton PID for Xic->pKpi"}; | ||
|
|
@@ -1848,7 +1851,7 @@ struct HfTrackIndexSkimCreator { | |
| /// \param isIdentifiedPidTrack0 is the flag that tells if the track 0 has been tagged as a proton | ||
| /// \param isIdentifiedPidTrack2 is the flag that tells if the track 2 has been tagged as a proton | ||
| /// \param cutStatus is a 2D array with outcome of each selection (filled only in debug mode) | ||
| /// \param whichHypo information of the mass hypoteses that were selected | ||
| /// \param whichHypo information of the mass hypotheses that were selected | ||
| /// \param isSelected is a bitmap with selection outcome | ||
| template <typename T2, typename T3, typename T4> | ||
| void applyPreselection3Prong(T2 const& pVecTrack0, T2 const& pVecTrack1, T2 const& pVecTrack2, const auto isIdentifiedPidTrack0, const auto isIdentifiedPidTrack2, T3& cutStatus, T4& whichHypo, auto& isSelected) | ||
|
|
@@ -2000,7 +2003,7 @@ struct HfTrackIndexSkimCreator { | |
| /// \param cutStatus is a 2D array with outcome of each selection (filled only in debug mode) | ||
| /// \param isSelected ia s bitmap with selection outcome | ||
| template <typename T1, typename T2, typename T3, typename T4> | ||
| void applySelection3Prong(const T1& pVecCand, const T2& secVtx, const T3& primVtx, T4& cutStatus, auto& isSelected) | ||
| void applySelection3Prong(const T1& pVecCand, const std::array<float, 3>& ptProngs, const T2& secVtx, const T3& primVtx, T4& cutStatus, auto& isSelected) | ||
| { | ||
| if (config.debug || isSelected > 0) { | ||
|
|
||
|
|
@@ -2038,6 +2041,17 @@ struct HfTrackIndexSkimCreator { | |
| } | ||
| } | ||
| } | ||
|
|
||
| // prong daughter pT | ||
|
vkucera marked this conversation as resolved.
Outdated
|
||
| if ((config.debug || TESTBIT(isSelected, iDecay3P))) { | ||
|
vkucera marked this conversation as resolved.
Outdated
|
||
| const auto ptProngMin = config.ptProngMin3Prong->get(iDecay3P); | ||
| if (ptProngs[0] < ptProngMin || ptProngs[1] < ptProngMin || ptProngs[2] < ptProngMin) { | ||
| CLRBIT(isSelected, iDecay3P); | ||
| if (config.debug) { | ||
| cutStatus[iDecay3P][4] = false; | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems like you are using an existing reserved slot. Should you not extend the numbers of cuts instead? |
||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -2643,6 +2657,7 @@ struct HfTrackIndexSkimCreator { | |
|
|
||
| auto trackParVarPos2 = getTrackParCov(trackPos2); | ||
| std::array dcaInfoPos2{trackPos2.dcaXY(), trackPos2.dcaZ()}; | ||
| std::array ptProngs{trackPos1.pt(), trackNeg1.pt(), trackPos2.pt()}; | ||
|
vkucera marked this conversation as resolved.
Outdated
|
||
|
|
||
| // preselection of 3-prong candidates | ||
| if (isSelected3ProngCand) { | ||
|
|
@@ -2784,7 +2799,7 @@ struct HfTrackIndexSkimCreator { | |
| const auto pVecCandProng3Pos = RecoDecay::pVec(pvec0, pvec1, pvec2); | ||
|
|
||
| // 3-prong selections after secondary vertex | ||
| applySelection3Prong(pVecCandProng3Pos, secondaryVertex3, pvRefitCoord3Prong2Pos1Neg, cutStatus3Prong, isSelected3ProngCand); | ||
| applySelection3Prong(pVecCandProng3Pos, ptProngs, secondaryVertex3, pvRefitCoord3Prong2Pos1Neg, cutStatus3Prong, isSelected3ProngCand); | ||
|
|
||
| std::array<std::vector<float>, kN3ProngDecaysUsedMlForHfFilters> mlScores3Prongs; | ||
| if (config.applyMlForHfFilters) { | ||
|
|
@@ -2917,6 +2932,7 @@ struct HfTrackIndexSkimCreator { | |
| auto trackNeg2 = trackIndexNeg2.template track_as<TTracks>(); | ||
| auto trackParVarNeg2 = getTrackParCov(trackNeg2); | ||
| std::array dcaInfoNeg2{trackNeg2.dcaXY(), trackNeg2.dcaZ()}; | ||
| std::array ptProngs{trackPos1.pt(), trackNeg1.pt(), trackNeg2.pt()}; | ||
|
|
||
| // preselection of 3-prong candidates | ||
| if (isSelected3ProngCand) { | ||
|
|
@@ -3059,7 +3075,7 @@ struct HfTrackIndexSkimCreator { | |
| const auto pVecCandProng3Neg = RecoDecay::pVec(pvec0, pvec1, pvec2); | ||
|
|
||
| // 3-prong selections after secondary vertex | ||
| applySelection3Prong(pVecCandProng3Neg, secondaryVertex3, pvRefitCoord3Prong1Pos2Neg, cutStatus3Prong, isSelected3ProngCand); | ||
| applySelection3Prong(pVecCandProng3Neg, ptProngs, secondaryVertex3, pvRefitCoord3Prong1Pos2Neg, cutStatus3Prong, isSelected3ProngCand); | ||
|
|
||
| std::array<std::vector<float>, kN3ProngDecaysUsedMlForHfFilters> mlScores3Prongs{}; | ||
| if (config.applyMlForHfFilters) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.