diff --git a/Configuration/Eras/python/Era_Run2_2017_cff.py b/Configuration/Eras/python/Era_Run2_2017_cff.py index f3edca7cba96f..5b418ba6d64ee 100644 --- a/Configuration/Eras/python/Era_Run2_2017_cff.py +++ b/Configuration/Eras/python/Era_Run2_2017_cff.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms - +from Configuration.ProcessModifiers.trackdnn_cff import trackdnn from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel from Configuration.Eras.Modifier_run2_ECAL_2017_cff import run2_ECAL_2017 @@ -27,5 +27,5 @@ Run2_2017 = cms.ModifierChain(Run2_2016.copyAndExclude([run2_muon_2016, run2_HLTconditions_2016, run2_ECAL_2016, run2_egamma_2016,pixel_2016,run2_jme_2016, strips_vfp30_2016, ctpps_2016]), phase1Pixel, run2_ECAL_2017, run2_HF_2017, run2_HCAL_2017, run2_HE_2017, run2_HEPlan1_2017, - trackingPhase1, trackingMkFitProd, run2_GEM_2017, stage2L1Trigger_2017, run2_HLTconditions_2017, run2_muon_2017,run2_egamma_2017, ctpps_2017, run2_jme_2017) + trackingPhase1, trackdnn, trackingMkFitProd, run2_GEM_2017, stage2L1Trigger_2017, run2_HLTconditions_2017, run2_muon_2017,run2_egamma_2017, ctpps_2017, run2_jme_2017) diff --git a/Configuration/Eras/python/Era_Run2_2018_highBetaStar_cff.py b/Configuration/Eras/python/Era_Run2_2018_highBetaStar_cff.py index dd1aed83d7836..b4ae7aa5fd081 100644 --- a/Configuration/Eras/python/Era_Run2_2018_highBetaStar_cff.py +++ b/Configuration/Eras/python/Era_Run2_2018_highBetaStar_cff.py @@ -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) diff --git a/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py b/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py index f0393404ccb8c..0245702c787b9 100644 --- a/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py +++ b/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py @@ -1,9 +1,10 @@ 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 -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, trackingNoLoopers]), pp_on_AA, pp_on_AA_2018) + diff --git a/Configuration/Eras/python/Era_Run3_noMkFit_cff.py b/Configuration/Eras/python/Era_Run3_noMkFit_cff.py index 839d5e8299968..6cae044556261 100644 --- a/Configuration/Eras/python/Era_Run3_noMkFit_cff.py +++ b/Configuration/Eras/python/Era_Run3_noMkFit_cff.py @@ -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) diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py index 6a23c043f8368..329a644a289a0 100644 --- a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py +++ b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py @@ -1,8 +1,10 @@ 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 -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, trackingNoLoopers]), pp_on_AA, pp_on_PbPb_run3) + diff --git a/Configuration/ProcessModifiers/python/trackdnn_CKF_cff.py b/Configuration/ProcessModifiers/python/trackdnn_CKF_cff.py new file mode 100644 index 0000000000000..9f37111ec2af7 --- /dev/null +++ b/Configuration/ProcessModifiers/python/trackdnn_CKF_cff.py @@ -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() diff --git a/Configuration/ProcessModifiers/python/trackdnn_cff.py b/Configuration/ProcessModifiers/python/trackdnn_cff.py index aa14e5d6711e4..9374be026580b 100644 --- a/Configuration/ProcessModifiers/python/trackdnn_cff.py +++ b/Configuration/ProcessModifiers/python/trackdnn_cff.py @@ -2,3 +2,4 @@ # This modifier sets the used tracking classifier to be a deep neural network instead of the BDT trackdnn = cms.Modifier() + diff --git a/RecoTracker/FinalTrackSelectors/plugins/TrackTfClassifier.cc b/RecoTracker/FinalTrackSelectors/plugins/TrackTfClassifier.cc index 156410b04c892..e4f5473016cd1 100644 --- a/RecoTracker/FinalTrackSelectors/plugins/TrackTfClassifier.cc +++ b/RecoTracker/FinalTrackSelectors/plugins/TrackTfClassifier.cc @@ -20,12 +20,11 @@ namespace { {} - static const char* name() { return "TrackTfClassifier"; } + static const char* name() { return "trackTfClassifierDefault"; } static void fillDescriptions(edm::ParameterSetDescription& desc) { desc.add("tfDnnLabel", "trackSelectionTf"); } - void beginStream() {} void initEvent(const edm::EventSetup& es) { diff --git a/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_CKF_cfi.py b/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_CKF_cfi.py new file mode 100644 index 0000000000000..84587df988c63 --- /dev/null +++ b/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_CKF_cfi.py @@ -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" +) + diff --git a/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_cfi.py b/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_cfi.py index cf4f536adceae..0e9bfbb690323 100644 --- a/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/trackSelectionTf_cfi.py @@ -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" ) + + diff --git a/RecoTracker/FinalTrackSelectors/python/trackTfClassifier_cfi.py b/RecoTracker/FinalTrackSelectors/python/trackTfClassifier_cfi.py new file mode 100644 index 0000000000000..73679ccc297b6 --- /dev/null +++ b/RecoTracker/FinalTrackSelectors/python/trackTfClassifier_cfi.py @@ -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') diff --git a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py index 5671c35524a4e..bf2ec7681eb7b 100644 --- a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py @@ -240,13 +240,15 @@ qualityCuts = [-0.5,0.0,0.5] ) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(detachedQuadStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(detachedQuadStep, trackTfClassifier.clone( src = 'detachedQuadStepTracks', - qualityCuts = qualityCutDictionary['DetachedQuadStep'] + qualityCuts = qualityCutDictionary.DetachedQuadStep.value() )) + highBetaStar_2018.toModify(detachedQuadStep,qualityCuts = [-0.7,0.0,0.5]) pp_on_AA.toModify(detachedQuadStep, mva = dict(GBRForestLabel = 'HIMVASelectorDetachedQuadStep_Phase1'), diff --git a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py index 40e2df67c0c09..944a6d1d49ae9 100644 --- a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py @@ -290,11 +290,12 @@ qualityCuts = [-0.2,0.3,0.8] )) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(detachedTripletStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(detachedTripletStep, trackTfClassifier.clone( src = 'detachedTripletStepTracks', - qualityCuts = qualityCutDictionary['DetachedTripletStep'], + qualityCuts = qualityCutDictionary.DetachedTripletStep.value() )) (trackdnn & fastSim).toModify(detachedTripletStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') diff --git a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py index 80ab8fc76ca89..37f001189972f 100644 --- a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py @@ -282,13 +282,13 @@ qualityCuts = [0.2,0.3,0.4] ) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(highPtTripletStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(highPtTripletStep, trackTfClassifier.clone( src = 'highPtTripletStepTracks', - qualityCuts = qualityCutDictionary['HighPtTripletStep'], + qualityCuts = qualityCutDictionary.HighPtTripletStep.value() )) - highBetaStar_2018.toModify(highPtTripletStep,qualityCuts = [-0.2,0.3,0.4]) pp_on_AA.toModify(highPtTripletStep, mva = dict(GBRForestLabel = 'HIMVASelectorHighPtTripletStep_Phase1'), diff --git a/RecoTracker/IterativeTracking/python/InitialStep_cff.py b/RecoTracker/IterativeTracking/python/InitialStep_cff.py index 5f5cce8066578..aed538c1980d6 100644 --- a/RecoTracker/IterativeTracking/python/InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStep_cff.py @@ -335,14 +335,17 @@ qualityCuts = [-0.95,-0.85,-0.75] )) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(initialStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(initialStep, trackTfClassifier.clone( src = 'initialStepTracks', - qualityCuts = qualityCutDictionary["InitialStep"] + qualityCuts = qualityCutDictionary.InitialStep.value() )) + (trackdnn & fastSim).toModify(initialStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') + pp_on_AA.toModify(initialStep, mva = dict(GBRForestLabel = 'HIMVASelectorInitialStep_Phase1'), qualityCuts = [-0.9, -0.5, 0.2], diff --git a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py index b163e7ea42ad0..dac342e768220 100644 --- a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py +++ b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py @@ -282,19 +282,21 @@ src = 'jetCoreRegionalStepBarrelTracks', )) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(jetCoreRegionalStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(jetCoreRegionalStep, trackTfClassifier.clone( src = 'jetCoreRegionalStepTracks', - qualityCuts = qualityCutDictionary["JetCoreRegionalStep"], + qualityCuts = qualityCutDictionary.JetCoreRegionalStep.value() )) -trackdnn.toReplaceWith(jetCoreRegionalStepBarrel, TrackTfClassifier.clone( +trackdnn.toReplaceWith(jetCoreRegionalStepBarrel, trackTfClassifier.clone( src = 'jetCoreRegionalStepBarrelTracks', - qualityCuts = qualityCutDictionary["JetCoreRegionalStep"], + qualityCuts = qualityCutDictionary.JetCoreRegionalStep.value() )) fastSim.toModify(jetCoreRegionalStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') + jetCoreRegionalStepEndcap = jetCoreRegionalStep.clone( src = 'jetCoreRegionalStepEndcapTracks', ) diff --git a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py index 594a96cef5e79..5f050e6b0a08b 100644 --- a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py @@ -231,13 +231,13 @@ qualityCuts = [-0.7,-0.35,-0.15] ) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(lowPtQuadStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(lowPtQuadStep, trackTfClassifier.clone( src = 'lowPtQuadStepTracks', - qualityCuts = qualityCutDictionary["LowPtQuadStep"] + qualityCuts = qualityCutDictionary.LowPtQuadStep.value() )) - highBetaStar_2018.toModify(lowPtQuadStep,qualityCuts = [-0.9,-0.35,-0.15]) pp_on_AA.toModify(lowPtQuadStep, mva = dict(GBRForestLabel = 'HIMVASelectorLowPtQuadStep_Phase1'), diff --git a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py index 9a4992071dc8f..18dd521874356 100644 --- a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py @@ -310,13 +310,13 @@ qualityCuts = [-0.4,0.0,0.3], )) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(lowPtTripletStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(lowPtTripletStep, trackTfClassifier.clone( src = 'lowPtTripletStepTracks', - qualityCuts = qualityCutDictionary['LowPtTripletStep'] + qualityCuts = qualityCutDictionary.LowPtTripletStep.value() )) - highBetaStar_2018.toModify(lowPtTripletStep,qualityCuts = [-0.7,-0.3,-0.1]) pp_on_AA.toModify(lowPtTripletStep, mva = dict(GBRForestLabel = 'HIMVASelectorLowPtTripletStep_Phase1'), diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py index b5a53d63f1f4f..1a775962f22d1 100644 --- a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py @@ -375,11 +375,12 @@ qualityCuts = [-0.5,0.0,0.5] )) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(mixedTripletStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(mixedTripletStep, trackTfClassifier.clone( src = 'mixedTripletStepTracks', - qualityCuts = qualityCutDictionary['MixedTripletStep'] + qualityCuts = qualityCutDictionary.MixedTripletStep.value() )) (trackdnn & fastSim).toModify(mixedTripletStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') diff --git a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py index 9d6e03e95b345..58230478eb6d9 100644 --- a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py @@ -385,11 +385,12 @@ qualityCuts = [-0.4,0.0,0.4] )) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(pixelLessStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(pixelLessStep, trackTfClassifier.clone( src = 'pixelLessStepTracks', - qualityCuts = qualityCutDictionary['PixelLessStep'] + qualityCuts = qualityCutDictionary.PixelLessStep.value() )) (trackdnn & fastSim).toModify(pixelLessStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') diff --git a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py index b99c88a6ed37f..22eacbce09e6b 100644 --- a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py @@ -372,11 +372,12 @@ ) trackingPhase1.toModify(pixelPairStep, mva=dict(GBRForestLabel = 'MVASelectorPixelPairStep_Phase1')) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(pixelPairStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(pixelPairStep, trackTfClassifier.clone( src='pixelPairStepTracks', - qualityCuts=qualityCutDictionary['PixelPairStep'] + qualityCuts=qualityCutDictionary.PixelPairStep.value() )) highBetaStar_2018.toModify(pixelPairStep,qualityCuts = [-0.95,0.0,0.3]) diff --git a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py index efb284134235d..c78b443d0a1c9 100644 --- a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py @@ -413,11 +413,12 @@ qualityCuts = [-0.6,-0.45,-0.3] )) -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * from RecoTracker.FinalTrackSelectors.trackSelectionTf_cfi import * -trackdnn.toReplaceWith(tobTecStep, TrackTfClassifier.clone( +from RecoTracker.FinalTrackSelectors.trackSelectionTf_CKF_cfi import * +trackdnn.toReplaceWith(tobTecStep, trackTfClassifier.clone( src = 'tobTecStepTracks', - qualityCuts = qualityCutDictionary["TobTecStep"] + qualityCuts = qualityCutDictionary.TobTecStep.value() )) (trackdnn & fastSim).toModify(tobTecStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') diff --git a/RecoTracker/IterativeTracking/python/dnnQualityCuts.py b/RecoTracker/IterativeTracking/python/dnnQualityCuts.py index 315e2a9e94dd3..735267410a4d3 100644 --- a/RecoTracker/IterativeTracking/python/dnnQualityCuts.py +++ b/RecoTracker/IterativeTracking/python/dnnQualityCuts.py @@ -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] +) diff --git a/RecoTracker/IterativeTracking/python/iterativeTk_cff.py b/RecoTracker/IterativeTracking/python/iterativeTk_cff.py index 89efb64bd62aa..612bd5752084f 100644 --- a/RecoTracker/IterativeTracking/python/iterativeTk_cff.py +++ b/RecoTracker/IterativeTracking/python/iterativeTk_cff.py @@ -24,8 +24,7 @@ from RecoTracker.ConversionSeedGenerators.ConversionStep_cff import * import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg -from RecoTracker.FinalTrackSelectors.TrackTfClassifier_cfi import * - +from RecoTracker.FinalTrackSelectors.trackTfClassifier_cfi import * trackdnn_source = cms.ESSource("EmptyESSource", recordName = cms.string("TfGraphRecord"), firstValid = cms.vuint32(1), iovIsRunNotTime = cms.bool(True) ) iterTrackingEarlyTask = _cfg.createEarlyTask("", "", globals())