From d48ae7c46d2645c90ca0a69ff43d739ff0d89eb0 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 11 Nov 2016 12:16:43 +0100 Subject: [PATCH 1/6] Remove unnecessary imports --- Configuration/Eras/python/Era_Run2_2017_cff.py | 4 ---- Configuration/Eras/python/ModifierChain_run2_2017_core_cff.py | 1 - 2 files changed, 5 deletions(-) diff --git a/Configuration/Eras/python/Era_Run2_2017_cff.py b/Configuration/Eras/python/Era_Run2_2017_cff.py index 98bd927c55d7c..9202cec143e17 100644 --- a/Configuration/Eras/python/Era_Run2_2017_cff.py +++ b/Configuration/Eras/python/Era_Run2_2017_cff.py @@ -1,11 +1,7 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 from Configuration.Eras.ModifierChain_run2_2017_core_cff import run2_2017_core from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 -from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017 -from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 -from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 Run2_2017 = cms.ModifierChain(run2_2017_core, trackingPhase1) diff --git a/Configuration/Eras/python/ModifierChain_run2_2017_core_cff.py b/Configuration/Eras/python/ModifierChain_run2_2017_core_cff.py index 3fae2eb24a201..b13bee590cb4a 100644 --- a/Configuration/Eras/python/ModifierChain_run2_2017_core_cff.py +++ b/Configuration/Eras/python/ModifierChain_run2_2017_core_cff.py @@ -2,7 +2,6 @@ from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel -from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017 from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 From f8204f7f26aabaa2a7cc191d04108b20090ccbf0 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Mon, 5 Dec 2016 17:47:50 +0100 Subject: [PATCH 2/6] Minimal work to disable trackingPhase1PU70 workflows Configurations will be cleaned up later. --- .../Era_Run2_2017_trackingPhase1PU70_cff.py | 7 ------- .../PyReleaseValidation/python/relval_2017.py | 15 --------------- .../PyReleaseValidation/python/relval_steps.py | 2 -- Configuration/StandardSequences/python/Eras.py | 3 +-- 4 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 Configuration/Eras/python/Era_Run2_2017_trackingPhase1PU70_cff.py diff --git a/Configuration/Eras/python/Era_Run2_2017_trackingPhase1PU70_cff.py b/Configuration/Eras/python/Era_Run2_2017_trackingPhase1PU70_cff.py deleted file mode 100644 index 5e9a2d6ab2d29..0000000000000 --- a/Configuration/Eras/python/Era_Run2_2017_trackingPhase1PU70_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.ModifierChain_run2_2017_core_cff import run2_2017_core -from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 - -Run2_2017_trackingPhase1PU70 = cms.ModifierChain(run2_2017_core, trackingPhase1PU70) - diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index e27b15ed5dc5d..b8d873c6bc192 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -53,19 +53,6 @@ def _trackingRun2(stepList): continue res.append(s) return res -def _trackingPhase1PU70(stepList): - res = [] - for step in stepList: - s = step - if 'RecoFull' in step: - if 'trackingOnly' in step: - s = s.replace('Only', 'OnlyPhase1PU70') - else: - s = s.replace('Full', 'Full_trackingPhase1PU70') - if 'ALCA' in s: - continue - res.append(s) - return res # compose and adding tracking specific workflows in the IB test. # NB. those workflows are expected to be only used forIB test. @@ -73,5 +60,3 @@ def _trackingPhase1PU70(stepList): workflows[10024.1] = [ workflows[10024.0][0], _trackingOnly(workflows[10024.0][1]) ] workflows[10024.2] = [ workflows[10024.0][0], _trackingRun2(workflows[10024.0][1]) ] workflows[10024.3] = [ workflows[10024.1][0], _trackingRun2(workflows[10024.1][1]) ] -workflows[10024.4] = [ workflows[10024.0][0], _trackingPhase1PU70(workflows[10024.0][1]) ] -workflows[10024.5] = [ workflows[10024.1][0], _trackingPhase1PU70(workflows[10024.1][1]) ] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 2656091b31add..5d21ee2f31aae 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1937,5 +1937,3 @@ def lhegensim(fragment,howMuch): # 2017 tracking specific eras steps['RecoFull_trackingRun2_2017'] = merge([{'--era': 'Run2_2017_trackingRun2'}, steps['RecoFull_2017']]) steps['RecoFull_trackingOnlyRun2_2017'] = merge([{'--era': 'Run2_2017_trackingRun2'}, steps['RecoFull_trackingOnly_2017']]) -steps['RecoFull_trackingPhase1PU70_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1PU70'}, steps['RecoFull_2017']]) -steps['RecoFull_trackingOnlyPhase1PU70_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1PU70'}, steps['RecoFull_trackingOnly_2017']]) diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index ae9d4d14b1a21..2211ea58e5de0 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -21,7 +21,6 @@ def __init__(self): 'Run2_2016_pA', 'Run2_2017', 'Run2_2017_trackingRun2', - 'Run2_2017_trackingPhase1PU70', 'Run3', 'Phase2C1', 'Phase2C2', @@ -40,7 +39,7 @@ def __init__(self): 'phase2_common', 'phase2_tracker', 'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_timing_layer','phase2_hcal', - 'trackingLowPU', 'trackingPhase1', 'trackingPhase1PU70', 'ctpps_2016', 'trackingPhase2PU140', + 'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'trackingPhase2PU140', 'tracker_apv_vfp30_2016'] internalUseModChains = ['run2_2017_core'] From aa18ba0a7a08e22b7c5875f40b624b9ba5b0b5d2 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Tue, 6 Dec 2016 21:53:37 +0100 Subject: [PATCH 3/6] Add trackingPhase1QuadProp first as a copy of trackingPhase1 This will preserve the current phase1 tracking while I transform trackingPhase1 to use CA pixel seeding. --- ...ra_Run2_2017_trackingPhase1QuadProp_cff.py | 7 +++++++ .../Era_Run2_2017_trackingQuadProp_cff.py | 7 +++++++ .../Modifier_trackingPhase1QuadProp_cff.py | 3 +++ .../PyReleaseValidation/python/relval_2017.py | 15 +++++++++++++ .../python/relval_steps.py | 2 ++ .../StandardSequences/python/Eras.py | 3 ++- .../python/quadrupletseedmerging_cff.py | 2 ++ .../python/earlyGeneralTracks_cfi.py | 6 ++++-- .../python/DetachedQuadStep_cff.py | 4 ++++ .../python/DetachedTripletStep_cff.py | 9 ++++---- .../python/ElectronSeeds_cff.py | 21 ++++++++++++++++--- .../python/InitialStepPreSplitting_cff.py | 10 +++++++++ .../python/InitialStep_cff.py | 14 +++++++++++++ .../python/JetCoreRegionalStep_cff.py | 7 ++++--- .../python/LowPtQuadStep_cff.py | 4 ++++ .../python/LowPtTripletStep_cff.py | 9 ++++++-- .../python/MixedTripletStep_cff.py | 4 ++++ .../python/iterativeTkConfig.py | 4 +++- .../python/PixelLayerTriplets_cfi.py | 2 ++ .../RecoTrack/python/trackingNtuple_cff.py | 2 ++ 20 files changed, 119 insertions(+), 16 deletions(-) create mode 100644 Configuration/Eras/python/Era_Run2_2017_trackingPhase1QuadProp_cff.py create mode 100644 Configuration/Eras/python/Era_Run2_2017_trackingQuadProp_cff.py create mode 100644 Configuration/Eras/python/Modifier_trackingPhase1QuadProp_cff.py diff --git a/Configuration/Eras/python/Era_Run2_2017_trackingPhase1QuadProp_cff.py b/Configuration/Eras/python/Era_Run2_2017_trackingPhase1QuadProp_cff.py new file mode 100644 index 0000000000000..e35f248123772 --- /dev/null +++ b/Configuration/Eras/python/Era_Run2_2017_trackingPhase1QuadProp_cff.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.ModifierChain_run2_2017_core_cff import run2_2017_core +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp + +Run2_2017_trackingPhase1QuadProp = cms.ModifierChain(run2_2017_core, trackingPhase1QuadProp) + diff --git a/Configuration/Eras/python/Era_Run2_2017_trackingQuadProp_cff.py b/Configuration/Eras/python/Era_Run2_2017_trackingQuadProp_cff.py new file mode 100644 index 0000000000000..d7740dcef857d --- /dev/null +++ b/Configuration/Eras/python/Era_Run2_2017_trackingQuadProp_cff.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.ModifierChain_run2_2017_core_cff import run2_2017_core +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 + +Run2_2017_trackingPhase1QuadProp = cms.ModifierChain(run2_2017_core, trackingPhase1) + diff --git a/Configuration/Eras/python/Modifier_trackingPhase1QuadProp_cff.py b/Configuration/Eras/python/Modifier_trackingPhase1QuadProp_cff.py new file mode 100644 index 0000000000000..7afa38485853f --- /dev/null +++ b/Configuration/Eras/python/Modifier_trackingPhase1QuadProp_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +trackingPhase1QuadProp = cms.Modifier() diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index b8d873c6bc192..89b6e733fc65e 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -53,6 +53,19 @@ def _trackingRun2(stepList): continue res.append(s) return res +def _trackingPhase1QuadProp(stepList): + res = [] + for step in stepList: + s = step + if 'RecoFull' in step: + if 'trackingOnly' in step: + s = s.replace('Only', 'OnlyPhase1QuadProp') + else: + s = s.replace('Full', 'Full_trackingPhase1QuadProp') + if 'ALCA' in s: + continue + res.append(s) + return res # compose and adding tracking specific workflows in the IB test. # NB. those workflows are expected to be only used forIB test. @@ -60,3 +73,5 @@ def _trackingRun2(stepList): workflows[10024.1] = [ workflows[10024.0][0], _trackingOnly(workflows[10024.0][1]) ] workflows[10024.2] = [ workflows[10024.0][0], _trackingRun2(workflows[10024.0][1]) ] workflows[10024.3] = [ workflows[10024.1][0], _trackingRun2(workflows[10024.1][1]) ] +workflows[10024.4] = [ workflows[10024.0][0], _trackingPhase1QuadProp(workflows[10024.0][1]) ] +workflows[10024.5] = [ workflows[10024.1][0], _trackingPhase1QuadProp(workflows[10024.1][1]) ] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 5d21ee2f31aae..82d835e2a5521 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1937,3 +1937,5 @@ def lhegensim(fragment,howMuch): # 2017 tracking specific eras steps['RecoFull_trackingRun2_2017'] = merge([{'--era': 'Run2_2017_trackingRun2'}, steps['RecoFull_2017']]) steps['RecoFull_trackingOnlyRun2_2017'] = merge([{'--era': 'Run2_2017_trackingRun2'}, steps['RecoFull_trackingOnly_2017']]) +steps['RecoFull_trackingPhase1QuadProp_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1QuadProp'}, steps['RecoFull_2017']]) +steps['RecoFull_trackingOnlyPhase1QuadProp_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1QuadProp'}, steps['RecoFull_trackingOnly_2017']]) diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 2211ea58e5de0..5ebd81c1558da 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -21,6 +21,7 @@ def __init__(self): 'Run2_2016_pA', 'Run2_2017', 'Run2_2017_trackingRun2', + 'Run2_2017_trackingPhase1QuadProp', 'Run3', 'Phase2C1', 'Phase2C2', @@ -39,7 +40,7 @@ def __init__(self): 'phase2_common', 'phase2_tracker', 'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_timing_layer','phase2_hcal', - 'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'trackingPhase2PU140', + 'trackingLowPU', 'trackingPhase1', 'trackingPhase1QuadProp', 'ctpps_2016', 'trackingPhase2PU140', 'tracker_apv_vfp30_2016'] internalUseModChains = ['run2_2017_core'] diff --git a/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py b/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py index d585784eac57b..9fbdc8c6be878 100644 --- a/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py +++ b/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py @@ -62,6 +62,8 @@ ) from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 trackingPhase1.toModify(PixelSeedMergerQuadruplets, **_forPhase1) +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(PixelSeedMergerQuadruplets, **_forPhase1) from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 trackingPhase1PU70.toModify(PixelSeedMergerQuadruplets, **_forPhase1) from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 diff --git a/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py b/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py index 1f1c4d8abfd28..33b9dcf0ab6d0 100644 --- a/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py @@ -43,8 +43,8 @@ ] ) from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 -trackingPhase1.toModify( - earlyGeneralTracks, +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +_forPhase1 = dict( trackProducers = [ 'initialStepTracks', 'highPtTripletStepTracks', @@ -70,6 +70,8 @@ "tobTecStep" ], ) +trackingPhase1.toModify(earlyGeneralTracks, **_forPhase1) +trackingPhase1QuadProp.toModify(earlyGeneralTracks, **_forPhase1) # For Phase1PU70 from RecoTracker.FinalTrackSelectors.trackListMerger_cfi import trackListMerger as _trackListMerger diff --git a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py index 9ebc366ba44ff..861fcc8416a7d 100644 --- a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py @@ -21,6 +21,10 @@ trackingPhase1.toModify(detachedQuadStepSeedLayers, layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() ) +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(detachedQuadStepSeedLayers, + layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() +) from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 trackingPhase2PU140.toModify(detachedQuadStepSeedLayers, layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() diff --git a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py index 88404c6225a5b..96fed959c960c 100644 --- a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py @@ -16,9 +16,7 @@ detachedTripletStepSeedLayers = RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi.PixelLayerTriplets.clone() detachedTripletStepSeedLayers.BPix.skipClusters = cms.InputTag('detachedTripletStepClusters') detachedTripletStepSeedLayers.FPix.skipClusters = cms.InputTag('detachedTripletStepClusters') -from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 -trackingPhase1.toModify(detachedTripletStepSeedLayers, - layerList = [ +_phase1LayerList = [ 'BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4', # 'BPix1+BPix3+BPix4', # has "hole", not tested @@ -33,7 +31,10 @@ # 'BPix1+FPix2_pos+FPix3_pos', 'BPix1+FPix2_neg+FPix3_neg', # has "hole", not tested # 'BPix1+FPix1_pos+FPix3_pos', 'BPix1+FPix1_neg+FPix3_neg' # has "hole", not tested ] -) +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(detachedTripletStepSeedLayers, layerList=_phase1LayerList) +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(detachedTripletStepSeedLayers, layerList=_phase1LayerList) # TrackingRegion from RecoTracker.TkTrackingRegions.globalTrackingRegionFromBeamSpotFixedZ_cfi import globalTrackingRegionFromBeamSpotFixedZ as _globalTrackingRegionFromBeamSpotFixedZ diff --git a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py index 6deeac1a9b1ce..957e2631e1908 100644 --- a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py +++ b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py @@ -50,6 +50,10 @@ trackingPhase1.toModify(mixedTripletStepSeedClusterMask, oldClusterRemovalInfo = "detachedTripletStepSeedClusterMask" ) +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(mixedTripletStepSeedClusterMask, + oldClusterRemovalInfo = "detachedTripletStepSeedClusterMask" +) pixelLessStepSeedClusterMask = seedClusterRemover.clone( trajectories = cms.InputTag("pixelLessStepSeeds"), oldClusterRemovalInfo = cms.InputTag("mixedTripletStepSeedClusterMask") @@ -84,6 +88,7 @@ 'BPix1+FPix1_pos+FPix3_pos', 'BPix1+FPix1_neg+FPix3_neg' ] trackingPhase1.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1) +trackingPhase1QuadProp.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1) trackingPhase1PU70.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1, BPix = dict(skipClusters = 'pixelPairStepSeedClusterMask'), @@ -154,8 +159,7 @@ skipClusters = cms.InputTag('tripletElectronClusterMask') ) ) -trackingPhase1.toModify(pixelPairElectronSeedLayers, - layerList = [ +_layerListForPhase1 = [ 'BPix1+BPix2', 'BPix1+BPix3', 'BPix1+BPix4', 'BPix2+BPix3', 'BPix2+BPix4', 'BPix3+BPix4', @@ -166,7 +170,8 @@ 'FPix1_pos+FPix3_pos', 'FPix1_neg+FPix3_neg', 'FPix2_pos+FPix3_pos', 'FPix2_neg+FPix3_neg' ] -) +trackingPhase1.toModify(pixelPairElectronSeedLayers, layerList = _layerListForPhase1) +trackingPhase1QuadProp.toModify(pixelPairElectronSeedLayers, layerList = _layerListForPhase1) from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cff import globalTrackingRegionWithVertices as _globalTrackingRegionWithVertices pixelPairElectronTrackingRegions = _globalTrackingRegionWithVertices.clone(RegionPSet = dict( @@ -254,6 +259,15 @@ 'pixelPairElectronSeeds', 'stripPairElectronSeeds' ]) +trackingPhase1QuadProp.toModify(newCombinedSeeds, seedCollections = [ + 'initialStepSeeds', + 'highPtTripletStepSeeds', + 'mixedTripletStepSeeds', + 'pixelLessStepSeeds', + 'tripletElectronSeeds', + 'pixelPairElectronSeeds', + 'stripPairElectronSeeds' +]) trackingPhase1PU70.toModify(newCombinedSeeds, seedCollections = [ 'initialStepSeeds', 'highPtTripletStepSeeds', @@ -288,6 +302,7 @@ _electronSeedsSeq_Phase1 = electronSeedsSeq.copy() _electronSeedsSeq_Phase1.replace(pixelPairStepSeedClusterMask, detachedTripletStepSeedClusterMask) trackingPhase1.toReplaceWith(electronSeedsSeq, _electronSeedsSeq_Phase1) +trackingPhase1QuadProp.toReplaceWith(electronSeedsSeq, _electronSeedsSeq_Phase1) trackingPhase1PU70.toReplaceWith(electronSeedsSeq, cms.Sequence( initialStepSeedClusterMask* highPtTripletStepSeedClusterMask* diff --git a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py index 8a2aa9f110933..e7c2c11bd7d13 100644 --- a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py @@ -22,6 +22,10 @@ trackingPhase1.toModify(initialStepSeedLayersPreSplitting, layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() ) +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(initialStepSeedLayersPreSplitting, + layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() +) # TrackingRegion from RecoTracker.TkTrackingRegions.globalTrackingRegionFromBeamSpot_cfi import globalTrackingRegionFromBeamSpot as _globalTrackingRegionFromBeamSpot @@ -78,7 +82,12 @@ produceSeedingHitSets = False, produceIntermediateHitTriplets = True, ) +trackingPhase1QuadProp.toModify(initialStepHitTripletsPreSplitting, + produceSeedingHitSets = False, + produceIntermediateHitTriplets = True, +) trackingPhase1.toModify(initialStepSeedsPreSplitting, seedingHitSets = "initialStepHitQuadrupletsPreSplitting") +trackingPhase1QuadProp.toModify(initialStepSeedsPreSplitting, seedingHitSets = "initialStepHitQuadrupletsPreSplitting") # building @@ -201,6 +210,7 @@ _InitialStepPreSplitting_trackingPhase1 = InitialStepPreSplitting.copy() _InitialStepPreSplitting_trackingPhase1.replace(initialStepHitTripletsPreSplitting, initialStepHitTripletsPreSplitting*initialStepHitQuadrupletsPreSplitting) trackingPhase1.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_trackingPhase1) +trackingPhase1QuadProp.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_trackingPhase1) # Although InitialStepPreSplitting is not really part of LowPU/Run1/Phase1PU70 # tracking, we use it to get siPixelClusters and siPixelRecHits diff --git a/RecoTracker/IterativeTracking/python/InitialStep_cff.py b/RecoTracker/IterativeTracking/python/InitialStep_cff.py index 9ae375a1516b9..1fdba15e2beef 100644 --- a/RecoTracker/IterativeTracking/python/InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStep_cff.py @@ -21,6 +21,16 @@ 'BPix1+FPix1_neg+FPix2_neg' ] ) +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(initialStepSeedLayers, + layerList = [ + 'BPix1+BPix2+BPix3', + 'BPix1+BPix2+FPix1_pos', + 'BPix1+BPix2+FPix1_neg', + 'BPix1+FPix1_pos+FPix2_pos', + 'BPix1+FPix1_neg+FPix2_neg' + ] +) trackingPhase2PU140.toModify(initialStepSeedLayers, layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() ) @@ -178,6 +188,10 @@ inOutTrajectoryFilter = dict(refToPSet_ = "initialStepTrajectoryFilterInOut"), useSameTrajFilter = False ) +trackingPhase1QuadProp.toModify(initialStepTrajectoryBuilder, + inOutTrajectoryFilter = dict(refToPSet_ = "initialStepTrajectoryFilterInOut"), + useSameTrajFilter = False +) trackingPhase1PU70.toModify(initialStepTrajectoryBuilder, maxCand = 6) trackingPhase2PU140.toModify(initialStepTrajectoryBuilder, maxCand = 7, minNrOfHitsForRebuild = 1) diff --git a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py index 6a50a04c74ae3..d2df771a387cf 100644 --- a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py +++ b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py @@ -48,8 +48,8 @@ ) ) from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 -trackingPhase1.toModify(jetCoreRegionalStepSeedLayers, - layerList = [ +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +_layerListForPhase1 = [ 'BPix1+BPix2', 'BPix1+BPix3', 'BPix1+BPix4', 'BPix2+BPix3', 'BPix2+BPix4', 'BPix3+BPix4', @@ -61,7 +61,8 @@ #'BPix3+TIB1','BPix3+TIB2' 'BPix4+TIB1','BPix4+TIB2' ] -) +trackingPhase1.toModify(jetCoreRegionalStepSeedLayers, layerList = _layerListForPhase1) +trackingPhase1QuadProp.toModify(jetCoreRegionalStepSeedLayers, layerList = _layerListForPhase1) # TrackingRegion from RecoTauTag.HLTProducers.tauRegionalPixelSeedTrackingRegions_cfi import tauRegionalPixelSeedTrackingRegions as _tauRegionalPixelSeedTrackingRegions diff --git a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py index c5c187744c008..220c330bcd79b 100644 --- a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py @@ -18,6 +18,10 @@ trackingPhase1.toModify(lowPtQuadStepSeedLayers, layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() ) +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(lowPtQuadStepSeedLayers, + layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() +) from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 trackingPhase2PU140.toModify(lowPtQuadStepSeedLayers, layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() diff --git a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py index b0deff074954b..e71a88454d3ce 100644 --- a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py @@ -26,8 +26,10 @@ 'BPix1+FPix1_pos+FPix3_pos', 'BPix1+FPix1_neg+FPix3_neg' ] from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 trackingPhase1.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase1) +trackingPhase1QuadProp.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase1) trackingPhase1PU70.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase1) # combination with gap removed as only source of fakes in current geometry (kept for doc,=) @@ -56,6 +58,7 @@ nSigmaZ = 4.0 )) trackingPhase1.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.35)) # FIXME: Phase1PU70 value, let's see if we can lower it to Run2 value (0.2) +trackingPhase1QuadProp.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.35)) # FIXME: Phase1PU70 value, let's see if we can lower it to Run2 value (0.2) trackingPhase1PU70.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.35, originRadius = 0.015)) trackingPhase2PU140.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.45)) @@ -191,7 +194,7 @@ # For Phase1 # MVA selection to be enabled after re-training, for time being we go with cut-based selector from RecoTracker.FinalTrackSelectors.TrackCutClassifier_cfi import TrackCutClassifier as _TrackCutClassifier -trackingPhase1.toReplaceWith(lowPtTripletStep, _TrackCutClassifier.clone( +_cutClassifierForPhase1 = _TrackCutClassifier.clone( src = "lowPtTripletStepTracks", vertices = "firstStepPrimaryVertices", mva = dict ( @@ -213,7 +216,9 @@ d0err_par = [0.002,0.002,0.001], ), ) -)) +) +trackingPhase1.toReplaceWith(lowPtTripletStep, _cutClassifierForPhase1) +trackingPhase1QuadProp.toReplaceWith(lowPtTripletStep, _cutClassifierForPhase1) # For LowPU and Phase1PU70 import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py index fdfaff8a3e3d5..86297b0d6aaa5 100644 --- a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py @@ -21,6 +21,9 @@ from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 trackingPhase1.toModify(chargeCut2069Clusters, oldClusterRemovalInfo = mixedTripletStepClusters.oldClusterRemovalInfo.value()) trackingPhase1.toModify(mixedTripletStepClusters, oldClusterRemovalInfo="chargeCut2069Clusters") +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(chargeCut2069Clusters, oldClusterRemovalInfo = mixedTripletStepClusters.oldClusterRemovalInfo.value()) +trackingPhase1QuadProp.toModify(mixedTripletStepClusters, oldClusterRemovalInfo="chargeCut2069Clusters") # SEEDING LAYERS from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import * @@ -145,6 +148,7 @@ TIB = dict(clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny')), ) trackingPhase1.toModify(mixedTripletStepSeedLayersB, layerList = ['BPix3+BPix4+TIB1']) +trackingPhase1QuadProp.toModify(mixedTripletStepSeedLayersB, layerList = ['BPix3+BPix4+TIB1']) trackingPhase1PU70.toModify(mixedTripletStepSeedLayersB, layerList = [ 'BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4','BPix1+BPix2+BPix4', 'BPix1+BPix3+BPix4' diff --git a/RecoTracker/IterativeTracking/python/iterativeTkConfig.py b/RecoTracker/IterativeTracking/python/iterativeTkConfig.py index 14cfa7a9c9357..b17be5ac70c02 100644 --- a/RecoTracker/IterativeTracking/python/iterativeTkConfig.py +++ b/RecoTracker/IterativeTracking/python/iterativeTkConfig.py @@ -4,7 +4,7 @@ import FWCore.ParameterSet.Config as cms _defaultEraName = "" -_nonDefaultEraNames = ["trackingLowPU", "trackingPhase1", "trackingPhase1PU70", "trackingPhase2PU140"] +_nonDefaultEraNames = ["trackingLowPU", "trackingPhase1", "trackingPhase1QuadProp", "trackingPhase1PU70", "trackingPhase2PU140"] # name, postfix, era _defaultEra = (_defaultEraName, "", None) @@ -47,6 +47,7 @@ "TobTecStep", "JetCoreRegionalStep", ] +_iterations_trackingPhase1QuadProp = _iterations_trackingPhase1 _iterations_trackingPhase1PU70 = [ "InitialStep", "HighPtTripletStep", @@ -80,6 +81,7 @@ "MixedTripletStep": ["A", "B"], } _multipleSeedProducers_trackingPhase1 = _multipleSeedProducers +_multipleSeedProducers_trackingPhase1QuadProp = _multipleSeedProducers_trackingPhase1 _multipleSeedProducers_trackingPhase1PU70 = _multipleSeedProducers_trackingLowPU _multipleSeedProducers_trackingPhase2PU140 = {} _oldStyleHasSelector = set([ diff --git a/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py b/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py index 5dd30ee1868c5..d9ee13caf4cc8 100644 --- a/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py +++ b/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py @@ -36,6 +36,8 @@ ] from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 trackingPhase1.toModify(PixelLayerTriplets, layerList=_layersForPhase1) +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1QuadProp.toModify(PixelLayerTriplets, layerList=_layersForPhase1) from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 trackingPhase1PU70.toModify(PixelLayerTriplets, layerList=_layersForPhase1) diff --git a/Validation/RecoTrack/python/trackingNtuple_cff.py b/Validation/RecoTrack/python/trackingNtuple_cff.py index 43e6f5b878c78..1f211a7f91fb2 100644 --- a/Validation/RecoTrack/python/trackingNtuple_cff.py +++ b/Validation/RecoTrack/python/trackingNtuple_cff.py @@ -62,7 +62,9 @@ def _filterForNtuple(lst): trackingNtuple.seedTracks = _seedSelectors from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp trackingPhase1.toModify(trackingNtuple, seedTracks = _seedSelectors_trackingPhase1) +trackingPhase1QuadProp.toModify(trackingNtuple, seedTracks = _seedSelectors_trackingPhase1) trackingNtupleSequence = cms.Sequence() # reproduce hits because they're not stored in RECO From 264cf7bd948a26286bdc81deb226917b9f5c2160 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Wed, 7 Dec 2016 09:15:38 +0100 Subject: [PATCH 4/6] Switch trackingPhase1 to CA seeding Tuning by Felice Pantaleo. --- .../python/DetachedQuadStep_cff.py | 17 ++++++++++ .../python/DetachedTripletStep_cff.py | 16 +++++++++ .../python/ElectronSeeds_cff.py | 15 +++------ .../python/HighPtTripletStep_cff.py | 18 ++++++++++ .../python/InitialStepPreSplitting_cff.py | 25 +++++++++++--- .../python/InitialStep_cff.py | 33 ++++++++++++------- .../python/LowPtQuadStep_cff.py | 19 +++++++++++ .../python/LowPtTripletStep_cff.py | 17 +++++++++- .../RecoTrack/python/trackingNtuple_cff.py | 10 +++--- 9 files changed, 138 insertions(+), 32 deletions(-) diff --git a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py index 861fcc8416a7d..a7fccead8856a 100644 --- a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py @@ -83,6 +83,22 @@ fitFastCircle = True, fitFastCircleChi2Cut = True, ) +from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer +trackingPhase1.toModify(detachedQuadStepHitDoublets, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3) +trackingPhase1.toReplaceWith(detachedQuadStepHitQuadruplets, _caHitQuadrupletEDProducer.clone( + doublets = "detachedQuadStepHitDoublets", + extraHitRPhitolerance = detachedQuadStepHitTriplets.extraHitRPhitolerance, + maxChi2 = dict( + pt1 = 0.8, pt2 = 2, + value1 = 500, value2 = 100, + ), + useBendingCorrection = True, + fitFastCircle = True, + fitFastCircleChi2Cut = True, + CAThetaCut = 0.0011, + CAPhiCut = 0, +)) + from RecoPixelVertexing.PixelTriplets.pixelQuadrupletMergerEDProducer_cfi import pixelQuadrupletMergerEDProducer as _pixelQuadrupletMergerEDProducer from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import * _detachedQuadStepHitQuadrupletsMerging = _pixelQuadrupletMergerEDProducer.clone( @@ -445,6 +461,7 @@ detachedQuadStepTracks* detachedQuadStepClassifier1*detachedQuadStepClassifier2* detachedQuadStep) +trackingPhase1.toReplaceWith(DetachedQuadStep, DetachedQuadStep.copyAndExclude([detachedQuadStepHitTriplets])) _DetachedQuadStep_Phase1PU70 = DetachedQuadStep.copyAndExclude([detachedQuadStepClassifier1]) _DetachedQuadStep_Phase1PU70.replace(detachedQuadStepClassifier2, detachedQuadStepSelector) trackingPhase1PU70.toReplaceWith(DetachedQuadStep, _DetachedQuadStep_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py index 96fed959c960c..0eaa767e3a23b 100644 --- a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py @@ -43,6 +43,7 @@ originHalfLength = 15.0, originRadius = 1.5 )) +trackingPhase1.toModify(detachedTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.25)) # seeding from RecoTracker.TkHitPairs.hitPairEDProducer_cfi import hitPairEDProducer as _hitPairEDProducer @@ -71,6 +72,21 @@ ), ) +from RecoPixelVertexing.PixelTriplets.caHitTripletEDProducer_cfi import caHitTripletEDProducer as _caHitTripletEDProducer +trackingPhase1.toModify(detachedTripletStepHitDoublets, layerPairs = [0,1]) # layer pairs (0,1), (1,2) +trackingPhase1.toReplaceWith(detachedTripletStepHitTriplets, _caHitTripletEDProducer.clone( + doublets = "detachedTripletStepHitDoublets", + extraHitRPhitolerance = detachedTripletStepHitTriplets.extraHitRPhitolerance, + maxChi2 = dict( + pt1 = 0.8, pt2 = 2, + value1 = 300 , value2 = 10, + ), + useBendingCorrection = True, + CAThetaCut = 0.001, + CAPhiCut = 0, + CAHardPtCut = 0.2, +)) + # QUALITY CUTS DURING TRACK BUILDING import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff _detachedTripletStepTrajectoryFilterBase = TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff.CkfBaseTrajectoryFilter_block.clone( diff --git a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py index 957e2631e1908..b70cf3a7aa467 100644 --- a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py +++ b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py @@ -250,7 +250,7 @@ cms.InputTag('stripPairElectronSeeds') ) ) -trackingPhase1.toModify(newCombinedSeeds, seedCollections = [ +_seedCollections_Phase1 = [ 'initialStepSeeds', 'highPtTripletStepSeeds', 'mixedTripletStepSeeds', @@ -258,16 +258,9 @@ 'tripletElectronSeeds', 'pixelPairElectronSeeds', 'stripPairElectronSeeds' -]) -trackingPhase1QuadProp.toModify(newCombinedSeeds, seedCollections = [ - 'initialStepSeeds', - 'highPtTripletStepSeeds', - 'mixedTripletStepSeeds', - 'pixelLessStepSeeds', - 'tripletElectronSeeds', - 'pixelPairElectronSeeds', - 'stripPairElectronSeeds' -]) +] +trackingPhase1.toModify(newCombinedSeeds, seedCollections = _seedCollections_Phase1) +trackingPhase1QuadProp.toModify(newCombinedSeeds, seedCollections = _seedCollections_Phase1) trackingPhase1PU70.toModify(newCombinedSeeds, seedCollections = [ 'initialStepSeeds', 'highPtTripletStepSeeds', diff --git a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py index b25afc8f4f27f..18d80139d7389 100644 --- a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py @@ -60,6 +60,8 @@ originRadius = 0.02, nSigmaZ = 4.0 )) +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(highPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.55)) from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 trackingPhase1PU70.toModify(highPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.7)) trackingPhase2PU140.toModify(highPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.9, originRadius = 0.03)) @@ -85,6 +87,22 @@ seedingHitSets = "highPtTripletStepHitTriplets", ) +from RecoPixelVertexing.PixelTriplets.caHitTripletEDProducer_cfi import caHitTripletEDProducer as _caHitTripletEDProducer +trackingPhase1.toModify(highPtTripletStepHitDoublets, layerPairs = [0,1]) # layer pairs (0,1), (1,2) +trackingPhase1.toReplaceWith(highPtTripletStepHitTriplets, _caHitTripletEDProducer.clone( + doublets = "highPtTripletStepHitDoublets", + extraHitRPhitolerance = highPtTripletStepHitTriplets.extraHitRPhitolerance, + SeedComparitorPSet = highPtTripletStepHitTriplets.SeedComparitorPSet, + maxChi2 = dict( + pt1 = 0.8, pt2 = 8, + value1 = 100, value2 = 6, + ), + useBendingCorrection = True, + CAThetaCut = 0.004, + CAPhiCut = 0.07, + CAHardPtCut = 0.3, +)) + # QUALITY CUTS DURING TRACK BUILDING import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff as _TrajectoryFilter_cff _highPtTripletStepTrajectoryFilterBase = _TrajectoryFilter_cff.CkfBaseTrajectoryFilter_block.clone( diff --git a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py index e7c2c11bd7d13..b0d5eceaca77c 100644 --- a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py @@ -34,6 +34,7 @@ originRadius = 0.02, nSigmaZ = 4.0 )) +trackingPhase1.toModify(initialStepTrackingRegionsPreSplitting, RegionPSet = dict(ptMin = 0.5)) # seeding from RecoTracker.TkHitPairs.hitPairEDProducer_cfi import hitPairEDProducer as _hitPairEDProducer @@ -55,6 +56,7 @@ ), ) from RecoPixelVertexing.PixelTriplets.pixelQuadrupletEDProducer_cfi import pixelQuadrupletEDProducer as _pixelQuadrupletEDProducer +trackingPhase1.toModify(initialStepHitDoubletsPreSplitting, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3) initialStepHitQuadrupletsPreSplitting = _pixelQuadrupletEDProducer.clone( triplets = "initialStepHitTripletsPreSplitting", extraHitRZtolerance = initialStepHitTripletsPreSplitting.extraHitRZtolerance, @@ -78,10 +80,23 @@ initialStepSeedsPreSplitting = _seedCreatorFromRegionConsecutiveHitsEDProducer.clone( seedingHitSets = "initialStepHitTripletsPreSplitting", ) -trackingPhase1.toModify(initialStepHitTripletsPreSplitting, - produceSeedingHitSets = False, - produceIntermediateHitTriplets = True, -) + +from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer +trackingPhase1.toReplaceWith(initialStepHitQuadrupletsPreSplitting, _caHitQuadrupletEDProducer.clone( + doublets = "initialStepHitDoubletsPreSplitting", + extraHitRPhitolerance = initialStepHitTripletsPreSplitting.extraHitRPhitolerance, + SeedComparitorPSet = initialStepHitTripletsPreSplitting.SeedComparitorPSet, + maxChi2 = dict( + pt1 = 0.7, pt2 = 2, + value1 = 200, value2 = 50, + ), + useBendingCorrection = True, + fitFastCircle = True, + fitFastCircleChi2Cut = True, + CAThetaCut = 0.0012, + CAPhiCut = 0.2, +)) + trackingPhase1QuadProp.toModify(initialStepHitTripletsPreSplitting, produceSeedingHitSets = False, produceIntermediateHitTriplets = True, @@ -209,7 +224,7 @@ _InitialStepPreSplitting_trackingPhase1 = InitialStepPreSplitting.copy() _InitialStepPreSplitting_trackingPhase1.replace(initialStepHitTripletsPreSplitting, initialStepHitTripletsPreSplitting*initialStepHitQuadrupletsPreSplitting) -trackingPhase1.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_trackingPhase1) +trackingPhase1.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_trackingPhase1.copyAndExclude([initialStepHitTripletsPreSplitting])) trackingPhase1QuadProp.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_trackingPhase1) # Although InitialStepPreSplitting is not really part of LowPU/Run1/Phase1PU70 diff --git a/RecoTracker/IterativeTracking/python/InitialStep_cff.py b/RecoTracker/IterativeTracking/python/InitialStep_cff.py index 1fdba15e2beef..2f13d31ac3a07 100644 --- a/RecoTracker/IterativeTracking/python/InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStep_cff.py @@ -13,13 +13,7 @@ initialStepSeedLayers = RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi.PixelLayerTriplets.clone() from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 trackingPhase1.toModify(initialStepSeedLayers, - layerList = [ - 'BPix1+BPix2+BPix3', - 'BPix1+BPix2+FPix1_pos', - 'BPix1+BPix2+FPix1_neg', - 'BPix1+FPix1_pos+FPix2_pos', - 'BPix1+FPix1_neg+FPix2_neg' - ] + layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() ) from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp trackingPhase1QuadProp.toModify(initialStepSeedLayers, @@ -44,6 +38,7 @@ )) from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase1.toModify(initialStepTrackingRegions, RegionPSet = dict(ptMin = 0.5)) trackingPhase1PU70.toModify(initialStepTrackingRegions, RegionPSet = dict(ptMin = 0.7)) trackingPhase2PU140.toModify(initialStepTrackingRegions, RegionPSet = dict(ptMin = 0.8)) @@ -93,10 +88,27 @@ fitFastCircleChi2Cut = True, SeedComparitorPSet = initialStepHitTriplets.SeedComparitorPSet ) +from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer +trackingPhase1.toModify(initialStepHitDoublets, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3) +trackingPhase1.toReplaceWith(initialStepHitQuadruplets, _caHitQuadrupletEDProducer.clone( + doublets = "initialStepHitDoublets", + extraHitRPhitolerance = initialStepHitTriplets.extraHitRPhitolerance, + SeedComparitorPSet = initialStepHitTriplets.SeedComparitorPSet, + maxChi2 = dict( + pt1 = 0.7, pt2 = 2, + value1 = 200, value2 = 50, + ), + useBendingCorrection = True, + fitFastCircle = True, + fitFastCircleChi2Cut = True, + CAThetaCut = 0.0012, + CAPhiCut = 0.2, +)) trackingPhase2PU140.toModify(initialStepHitTriplets, produceSeedingHitSets = False, produceIntermediateHitTriplets = True, ) +trackingPhase1.toModify(initialStepSeeds, seedingHitSets = "initialStepHitQuadruplets") trackingPhase2PU140.toModify(initialStepSeeds, seedingHitSets = "initialStepHitQuadruplets") # temporary... @@ -184,10 +196,6 @@ maxPtForLooperReconstruction = cms.double(0.7) ) trackingLowPU.toModify(initialStepTrajectoryBuilder, maxCand = 5) -trackingPhase1.toModify(initialStepTrajectoryBuilder, - inOutTrajectoryFilter = dict(refToPSet_ = "initialStepTrajectoryFilterInOut"), - useSameTrajFilter = False -) trackingPhase1QuadProp.toModify(initialStepTrajectoryBuilder, inOutTrajectoryFilter = dict(refToPSet_ = "initialStepTrajectoryFilterInOut"), useSameTrajFilter = False @@ -379,6 +387,9 @@ _InitialStep_LowPU = InitialStep.copyAndExclude([firstStepPrimaryVertices, initialStepClassifier1, initialStepClassifier2, initialStepClassifier3]) _InitialStep_LowPU.replace(initialStep, initialStepSelector) trackingLowPU.toReplaceWith(InitialStep, _InitialStep_LowPU) +_InitialStep_Phase1 = InitialStep.copy() +_InitialStep_Phase1.replace(initialStepHitTriplets, initialStepHitQuadruplets) +trackingPhase1.toReplaceWith(InitialStep, _InitialStep_Phase1) _InitialStep_Phase1PU70 = _InitialStep_LowPU.copy() _InitialStep_Phase1PU70.replace(initialStepHitTriplets, initialStepHitTriplets+initialStepHitQuadruplets) trackingPhase1PU70.toReplaceWith(InitialStep, _InitialStep_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py index 220c330bcd79b..22dd199d49792 100644 --- a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py @@ -34,6 +34,7 @@ originRadius = 0.02, nSigmaZ = 4.0 )) +trackingPhase1.toModify(lowPtQuadStepTrackingRegions, RegionPSet = dict(ptMin = 0.15)) trackingPhase2PU140.toModify(lowPtQuadStepTrackingRegions, RegionPSet = dict(ptMin = 0.35)) @@ -73,6 +74,23 @@ fitFastCircleChi2Cut = True, SeedComparitorPSet = lowPtQuadStepHitTriplets.SeedComparitorPSet, ) +from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer +trackingPhase1.toModify(lowPtQuadStepHitDoublets, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3) +trackingPhase1.toReplaceWith(lowPtQuadStepHitQuadruplets, _caHitQuadrupletEDProducer.clone( + doublets = "lowPtQuadStepHitDoublets", + extraHitRPhitolerance = lowPtQuadStepHitTriplets.extraHitRPhitolerance, + SeedComparitorPSet = lowPtQuadStepHitTriplets.SeedComparitorPSet, + maxChi2 = dict( + pt1 = 0.7, pt2 = 2, + value1 = 1000, value2 = 150, + ), + useBendingCorrection = True, + fitFastCircle = True, + fitFastCircleChi2Cut = True, + CAThetaCut = 0.0017, + CAPhiCut = 0.3, +)) + from RecoPixelVertexing.PixelTriplets.pixelQuadrupletMergerEDProducer_cfi import pixelQuadrupletMergerEDProducer as _pixelQuadrupletMergerEDProducer from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import * _lowPtQuadStepHitQuadrupletsMerging = _pixelQuadrupletMergerEDProducer.clone( @@ -300,6 +318,7 @@ lowPtQuadStepTrackCandidates* lowPtQuadStepTracks* lowPtQuadStep) +trackingPhase1.toReplaceWith(LowPtQuadStep, LowPtQuadStep.copyAndExclude([lowPtQuadStepHitTriplets])) _LowPtQuadStep_Phase1PU70 = LowPtQuadStep.copy() _LowPtQuadStep_Phase1PU70.replace(lowPtQuadStep, lowPtQuadStepSelector) trackingPhase1PU70.toReplaceWith(LowPtQuadStep, _LowPtQuadStep_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py index e71a88454d3ce..4239f31a5ae7d 100644 --- a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py @@ -57,7 +57,7 @@ originRadius = 0.02, nSigmaZ = 4.0 )) -trackingPhase1.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.35)) # FIXME: Phase1PU70 value, let's see if we can lower it to Run2 value (0.2) +trackingPhase1.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.2)) trackingPhase1QuadProp.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.35)) # FIXME: Phase1PU70 value, let's see if we can lower it to Run2 value (0.2) trackingPhase1PU70.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.35, originRadius = 0.015)) trackingPhase2PU140.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.45)) @@ -83,6 +83,21 @@ seedingHitSets = "lowPtTripletStepHitTriplets", ) +from RecoPixelVertexing.PixelTriplets.caHitTripletEDProducer_cfi import caHitTripletEDProducer as _caHitTripletEDProducer +trackingPhase1.toModify(lowPtTripletStepHitDoublets, layerPairs = [0,1]) # layer pairs (0,1), (1,2) +trackingPhase1.toReplaceWith(lowPtTripletStepHitTriplets, _caHitTripletEDProducer.clone( + doublets = "lowPtTripletStepHitDoublets", + extraHitRPhitolerance = lowPtTripletStepHitTriplets.extraHitRPhitolerance, + SeedComparitorPSet = lowPtTripletStepHitTriplets.SeedComparitorPSet, + maxChi2 = dict( + pt1 = 0.8, pt2 = 2, + value1 = 70 , value2 = 8, + ), + useBendingCorrection = True, + CAThetaCut = 0.002, + CAPhiCut = 0.05, +)) + # QUALITY CUTS DURING TRACK BUILDING import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff as _TrajectoryFilter_cff diff --git a/Validation/RecoTrack/python/trackingNtuple_cff.py b/Validation/RecoTrack/python/trackingNtuple_cff.py index 1f211a7f91fb2..edd13f20cb02e 100644 --- a/Validation/RecoTrack/python/trackingNtuple_cff.py +++ b/Validation/RecoTrack/python/trackingNtuple_cff.py @@ -54,15 +54,17 @@ def _filterForNtuple(lst): return ret _seedProducers = _filterForNtuple(_TrackValidation_cff._seedProducers) _seedProducers_trackingPhase1 = _filterForNtuple(_TrackValidation_cff._seedProducers_trackingPhase1) +_seedProducers_trackingPhase1QuadProp = _filterForNtuple(_TrackValidation_cff._seedProducers_trackingPhase1QuadProp) (_seedSelectors, trackingNtupleSeedSelectors) = _TrackValidation_cff._addSeedToTrackProducers(_seedProducers, globals()) (_seedSelectors_trackingPhase1, _trackingNtupleSeedSelectors_trackingPhase1) = _TrackValidation_cff._addSeedToTrackProducers(_seedProducers_trackingPhase1, globals()) -from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel -phase1Pixel.toReplaceWith(trackingNtupleSeedSelectors, _trackingNtupleSeedSelectors_trackingPhase1) - -trackingNtuple.seedTracks = _seedSelectors +(_seedSelectors_trackingPhase1QuadProp, _trackingNtupleSeedSelectors_trackingPhase1QuadProp) = _TrackValidation_cff._addSeedToTrackProducers(_seedProducers_trackingPhase1QuadProp, globals()) from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp +trackingPhase1.toReplaceWith(trackingNtupleSeedSelectors, _trackingNtupleSeedSelectors_trackingPhase1) +trackingPhase1QuadProp.toReplaceWith(trackingNtupleSeedSelectors, _trackingNtupleSeedSelectors_trackingPhase1QuadProp) + +trackingNtuple.seedTracks = _seedSelectors trackingPhase1.toModify(trackingNtuple, seedTracks = _seedSelectors_trackingPhase1) trackingPhase1QuadProp.toModify(trackingNtuple, seedTracks = _seedSelectors_trackingPhase1) From e66db97de074dc1f5da6db528956b18f427ce1dc Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Sat, 10 Dec 2016 20:28:32 +0100 Subject: [PATCH 5/6] Remove spurious file --- .../Eras/python/Era_Run2_2017_trackingQuadProp_cff.py | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Configuration/Eras/python/Era_Run2_2017_trackingQuadProp_cff.py diff --git a/Configuration/Eras/python/Era_Run2_2017_trackingQuadProp_cff.py b/Configuration/Eras/python/Era_Run2_2017_trackingQuadProp_cff.py deleted file mode 100644 index d7740dcef857d..0000000000000 --- a/Configuration/Eras/python/Era_Run2_2017_trackingQuadProp_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.ModifierChain_run2_2017_core_cff import run2_2017_core -from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 - -Run2_2017_trackingPhase1QuadProp = cms.ModifierChain(run2_2017_core, trackingPhase1) - From 8a86cb5394f95f539ae10ca11ccefe1c44252e45 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Tue, 13 Dec 2016 09:00:55 +0100 Subject: [PATCH 6/6] Switch the 'old' 2017 tracking back to default, and CA seeding to the special workflows --- Configuration/Eras/python/Era_Run2_2017_cff.py | 4 ++-- .../Eras/python/Era_Run2_2017_trackingPhase1CA_cff.py | 6 ++++++ .../python/Era_Run2_2017_trackingPhase1QuadProp_cff.py | 7 ------- .../PyReleaseValidation/python/relval_2017.py | 10 +++++----- .../PyReleaseValidation/python/relval_steps.py | 4 ++-- Configuration/StandardSequences/python/Eras.py | 2 +- 6 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 Configuration/Eras/python/Era_Run2_2017_trackingPhase1CA_cff.py delete mode 100644 Configuration/Eras/python/Era_Run2_2017_trackingPhase1QuadProp_cff.py diff --git a/Configuration/Eras/python/Era_Run2_2017_cff.py b/Configuration/Eras/python/Era_Run2_2017_cff.py index 9202cec143e17..60a8823d9d6e0 100644 --- a/Configuration/Eras/python/Era_Run2_2017_cff.py +++ b/Configuration/Eras/python/Era_Run2_2017_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Eras.ModifierChain_run2_2017_core_cff import run2_2017_core -from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp -Run2_2017 = cms.ModifierChain(run2_2017_core, trackingPhase1) +Run2_2017 = cms.ModifierChain(run2_2017_core, trackingPhase1QuadProp) diff --git a/Configuration/Eras/python/Era_Run2_2017_trackingPhase1CA_cff.py b/Configuration/Eras/python/Era_Run2_2017_trackingPhase1CA_cff.py new file mode 100644 index 0000000000000..d222156d7305c --- /dev/null +++ b/Configuration/Eras/python/Era_Run2_2017_trackingPhase1CA_cff.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.ModifierChain_run2_2017_core_cff import run2_2017_core +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 + +Run2_2017_trackingPhase1CA = cms.ModifierChain(run2_2017_core, trackingPhase1) diff --git a/Configuration/Eras/python/Era_Run2_2017_trackingPhase1QuadProp_cff.py b/Configuration/Eras/python/Era_Run2_2017_trackingPhase1QuadProp_cff.py deleted file mode 100644 index e35f248123772..0000000000000 --- a/Configuration/Eras/python/Era_Run2_2017_trackingPhase1QuadProp_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Eras.ModifierChain_run2_2017_core_cff import run2_2017_core -from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp - -Run2_2017_trackingPhase1QuadProp = cms.ModifierChain(run2_2017_core, trackingPhase1QuadProp) - diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index 89b6e733fc65e..8d182c1a35402 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -53,15 +53,15 @@ def _trackingRun2(stepList): continue res.append(s) return res -def _trackingPhase1QuadProp(stepList): +def _trackingPhase1CA(stepList): res = [] for step in stepList: s = step if 'RecoFull' in step: if 'trackingOnly' in step: - s = s.replace('Only', 'OnlyPhase1QuadProp') + s = s.replace('Only', 'OnlyPhase1CA') else: - s = s.replace('Full', 'Full_trackingPhase1QuadProp') + s = s.replace('Full', 'Full_trackingPhase1CA') if 'ALCA' in s: continue res.append(s) @@ -73,5 +73,5 @@ def _trackingPhase1QuadProp(stepList): workflows[10024.1] = [ workflows[10024.0][0], _trackingOnly(workflows[10024.0][1]) ] workflows[10024.2] = [ workflows[10024.0][0], _trackingRun2(workflows[10024.0][1]) ] workflows[10024.3] = [ workflows[10024.1][0], _trackingRun2(workflows[10024.1][1]) ] -workflows[10024.4] = [ workflows[10024.0][0], _trackingPhase1QuadProp(workflows[10024.0][1]) ] -workflows[10024.5] = [ workflows[10024.1][0], _trackingPhase1QuadProp(workflows[10024.1][1]) ] +workflows[10024.4] = [ workflows[10024.0][0], _trackingPhase1CA(workflows[10024.0][1]) ] +workflows[10024.5] = [ workflows[10024.1][0], _trackingPhase1CA(workflows[10024.1][1]) ] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 82d835e2a5521..7357d17759b71 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1937,5 +1937,5 @@ def lhegensim(fragment,howMuch): # 2017 tracking specific eras steps['RecoFull_trackingRun2_2017'] = merge([{'--era': 'Run2_2017_trackingRun2'}, steps['RecoFull_2017']]) steps['RecoFull_trackingOnlyRun2_2017'] = merge([{'--era': 'Run2_2017_trackingRun2'}, steps['RecoFull_trackingOnly_2017']]) -steps['RecoFull_trackingPhase1QuadProp_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1QuadProp'}, steps['RecoFull_2017']]) -steps['RecoFull_trackingOnlyPhase1QuadProp_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1QuadProp'}, steps['RecoFull_trackingOnly_2017']]) +steps['RecoFull_trackingPhase1CA_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1CA'}, steps['RecoFull_2017']]) +steps['RecoFull_trackingOnlyPhase1CA_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1CA'}, steps['RecoFull_trackingOnly_2017']]) diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 5ebd81c1558da..71290902e6acd 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -21,7 +21,7 @@ def __init__(self): 'Run2_2016_pA', 'Run2_2017', 'Run2_2017_trackingRun2', - 'Run2_2017_trackingPhase1QuadProp', + 'Run2_2017_trackingPhase1CA', 'Run3', 'Phase2C1', 'Phase2C2',