-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Track DNN update on mkFit tracks #35686
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 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
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 |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| from Configuration.ProcessModifiers.trackdnn_cff import trackdnn | ||
| from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 | ||
| from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018 | ||
|
|
||
| Run2_2018_highBetaStar = cms.ModifierChain(Run2_2018, highBetaStar_2018) | ||
| Run2_2018_highBetaStar = cms.ModifierChain(Run2_2018.copyAndExclude([trackdnn]), highBetaStar_2018) |
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 |
|---|---|---|
| @@ -1,9 +1,13 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| from Configuration.ProcessModifiers.trackdnn_cff import trackdnn | ||
| from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 | ||
| from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA | ||
| from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 | ||
| from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProd | ||
| from Configuration.ProcessModifiers.trackingNoLoopers_cff import trackingNoLoopers | ||
|
|
||
| <<<<<<< HEAD | ||
| Run2_2018_pp_on_AA = cms.ModifierChain(Run2_2018.copyAndExclude([trackingMkFitProd, trackingNoLoopers]), pp_on_AA, pp_on_AA_2018) | ||
| ======= | ||
| Run2_2018_pp_on_AA = cms.ModifierChain(Run2_2018.copyAndExclude([trackingMkFitProd, trackdnn]), pp_on_AA, pp_on_AA_2018) | ||
| >>>>>>> remove dnn in the heavy ion track selection | ||
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 |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| from Configuration.ProcessModifiers.trackdnn_CKF_cff import trackdnn_CKF | ||
| from Configuration.Eras.Era_Run3_cff import Run3 | ||
| from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProd | ||
|
|
||
| Run3_noMkFit = Run3.copyAndExclude([trackingMkFitProd]) | ||
| Run3_noMkFit = cms.ModifierChain(Run3.copyAndExclude([trackingMkFitProd]), trackdnn_CKF) |
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 | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,8 +1,13 @@ | ||||||||||||||
| import FWCore.ParameterSet.Config as cms | ||||||||||||||
|
|
||||||||||||||
| from Configuration.ProcessModifiers.trackdnn_CKF_cff import trackdnn_CKF | ||||||||||||||
| from Configuration.ProcessModifiers.trackdnn_cff import trackdnn | ||||||||||||||
| from Configuration.Eras.Era_Run3_noMkFit_cff import Run3_noMkFit | ||||||||||||||
| from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA | ||||||||||||||
| from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 | ||||||||||||||
| from Configuration.ProcessModifiers.trackingNoLoopers_cff import trackingNoLoopers | ||||||||||||||
|
|
||||||||||||||
| <<<<<<< HEAD | ||||||||||||||
| Run3_pp_on_PbPb = cms.ModifierChain(Run3_noMkFit.copyAndExclude([trackingNoLoopers]), pp_on_AA, pp_on_PbPb_run3) | ||||||||||||||
| ======= | ||||||||||||||
| Run3_pp_on_PbPb = cms.ModifierChain(Run3_noMkFit.copyAndExclude([trackdnn, trackdnn_CKF]), pp_on_AA, pp_on_PbPb_run3) | ||||||||||||||
| >>>>>>> remove dnn in the heavy ion track selection | ||||||||||||||
|
||||||||||||||
| <<<<<<< HEAD | |
| Run3_pp_on_PbPb = cms.ModifierChain(Run3_noMkFit.copyAndExclude([trackingNoLoopers]), pp_on_AA, pp_on_PbPb_run3) | |
| ======= | |
| Run3_pp_on_PbPb = cms.ModifierChain(Run3_noMkFit.copyAndExclude([trackdnn, trackdnn_CKF]), pp_on_AA, pp_on_PbPb_run3) | |
| >>>>>>> remove dnn in the heavy ion track selection | |
| Run3_pp_on_PbPb = cms.ModifierChain(Run3_noMkFit.copyAndExclude([trackingNoLoopers, trackdnn, trackdnn_CKF]), pp_on_AA, pp_on_PbPb_run3) |
Contributor
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@minxiyang
in case you did not notice: please update the python files which had conflicts to properly cleanup the conflicting lines.
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 |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| # This modifier sets the used tracking classifier to be a deep neural network instead of the BDT | ||
|
|
||
| trackdnn_CKF = cms.Modifier() |
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
7 changes: 7 additions & 0 deletions
7
RecoTracker/FinalTrackSelectors/python/trackSelectionTf_CKF_cfi.py
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 |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| from RecoTracker.FinalTrackSelectors.tfGraphDefProducer_cfi import tfGraphDefProducer as _tfGraphDefProducer | ||
|
|
||
| trackSelectionTf_CKF = _tfGraphDefProducer.clone( | ||
| ComponentName = "trackSelectionTf_CKF", | ||
| FileName = "RecoTracker/FinalTrackSelectors/data/TrackTfClassifier/CKF_2021Run3.pb" | ||
| ) | ||
|
|
4 changes: 3 additions & 1 deletion
4
RecoTracker/FinalTrackSelectors/python/trackSelectionTf_cfi.py
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 |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| from RecoTracker.FinalTrackSelectors.tfGraphDefProducer_cfi import tfGraphDefProducer as _tfGraphDefProducer | ||
| trackSelectionTf = _tfGraphDefProducer.clone( | ||
| ComponentName = "trackSelectionTf", | ||
| FileName = "RecoTracker/FinalTrackSelectors/data/TrackTfClassifier/QCDFlatPU_QCDHighPt_ZEE_DisplacedSUSY_2020.pb" | ||
| FileName = "RecoTracker/FinalTrackSelectors/data/TrackTfClassifier/MkFit4plus3_2021Run3.pb" | ||
| ) | ||
|
|
||
|
|
5 changes: 5 additions & 0 deletions
5
RecoTracker/FinalTrackSelectors/python/trackTfClassifier_cfi.py
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 |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| from Configuration.ProcessModifiers.trackdnn_CKF_cff import trackdnn_CKF | ||
| import RecoTracker.FinalTrackSelectors.trackTfClassifierDefault_cfi as _mod | ||
|
|
||
| trackTfClassifier = _mod.trackTfClassifierDefault.clone() | ||
| trackdnn_CKF.toModify(trackTfClassifier.mva, tfDnnLabel = 'trackSelectionTf_CKF') |
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
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
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
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
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
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 |
|---|---|---|
| @@ -1,14 +1,32 @@ | ||
| # https://indico.cern.ch/event/947686/contributions/3981867/attachments/2090510/3512658/TrackingDNN_24_8_2020.pdf | ||
| qualityCutDictionary = { | ||
| 'InitialStep': [-0.2, 0.15, 0.40], | ||
| 'LowPtQuadStep': [-0.2, 0.10, 0.45], | ||
| 'HighPtTripletStep': [0.55, 0.60, 0.65], | ||
| 'LowPtTripletStep': [-0.2, -0.1, 0.10], | ||
| 'DetachedQuadStep': [-0.3, 0.20, 0.55], | ||
| 'DetachedTripletStep': [-0.5, -0.1, 0.40], | ||
| 'PixelPairStep': [-0.4, -0.35, -0.3], | ||
| 'MixedTripletStep': [-0.7, -0.5, -0.3], | ||
| 'PixelLessStep': [-0.8, -0.7, -0.6], | ||
| 'TobTecStep': [-0.6, -0.55, -0.5], | ||
| 'JetCoreRegionalStep': [0.20, 0.30, 0.50] | ||
| } | ||
| import FWCore.ParameterSet.Config as cms | ||
| qualityCutDictionary = cms.PSet( | ||
| InitialStep = cms.vdouble(-0.48, 0.03, 0.25), | ||
| LowPtQuadStep = cms.vdouble(-0.33, 0.18, 0.41), | ||
| HighPtTripletStep = cms.vdouble(0.48, 0.55, 0.62), | ||
| LowPtTripletStep = cms.vdouble(-0.21, 0.17, 0.41), | ||
| DetachedQuadStep = cms.vdouble(-0.62, -0.09 ,0.50), | ||
| DetachedTripletStep = cms.vdouble(-0.52, 0.04, 0.76), | ||
| PixelPairStep = cms.vdouble(-0.47, -0.33, -0.05), | ||
| MixedTripletStep = cms.vdouble(-0.87, -0.61 ,-0.13), | ||
| PixelLessStep = cms.vdouble(-0.20, -0.10, 0.40), | ||
| TobTecStep = cms.vdouble(-0.44, -0.26, -0.14), | ||
| JetCoreRegionalStep = cms.vdouble(-0.14, 0.13, 0.61) | ||
|
|
||
| ) | ||
|
|
||
| from Configuration.ProcessModifiers.trackdnn_CKF_cff import trackdnn_CKF | ||
|
|
||
| trackdnn_CKF.toModify(qualityCutDictionary, | ||
| InitialStep = [-0.49, 0.08, 0.34], | ||
| LowPtQuadStep = [-0.29, 0.17, 0.39], | ||
| HighPtTripletStep = [0.5, 0.58, 0.65], | ||
| LowPtTripletStep = [-0.30, 0.06, 0.32], | ||
| DetachedQuadStep = [-0.61, -0.09, 0.51], | ||
| DetachedTripletStep = [-0.38, 0.31, 0.83], | ||
| PixelPairStep = [-0.25, -0.07, 0.19], | ||
| MixedTripletStep = [-0.86, -0.57, -0.12], | ||
| PixelLessStep = [-0.81, -0.61, -0.17], | ||
| TobTecStep = [-0.67, -0.54, -0.40], | ||
| JetCoreRegionalStep = [0.00, 0.03, 0.68] | ||
| ) |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.