From f9cf7fdabdb9330e7362cad2beda736810e0385a Mon Sep 17 00:00:00 2001 From: silviodonato Date: Thu, 2 Jul 2020 11:48:25 +0200 Subject: [PATCH] sync of modifiers in Phase2 L1T --- .../StandardSequences/python/L1TrackTrigger_cff.py | 3 ++- L1Trigger/Configuration/python/SimL1Emulator_cff.py | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Configuration/StandardSequences/python/L1TrackTrigger_cff.py b/Configuration/StandardSequences/python/L1TrackTrigger_cff.py index 1c1f67bb5c449..bdc4d55cba0c7 100644 --- a/Configuration/StandardSequences/python/L1TrackTrigger_cff.py +++ b/Configuration/StandardSequences/python/L1TrackTrigger_cff.py @@ -12,6 +12,7 @@ _tttracks_l1tracktrigger = cms.Sequence(_tttracks_l1tracktrigger + L1PromptExtendedHybridTracksWithAssociators) from Configuration.Eras.Modifier_phase2_trackerV14_cff import phase2_trackerV14 -phase2_trackerV14.toReplaceWith( L1TrackTrigger, _tttracks_l1tracktrigger ) +from Configuration.Eras.Modifier_phase2_trigger_cff import phase2_trigger +(phase2_trigger & phase2_trackerV14).toReplaceWith( L1TrackTrigger, _tttracks_l1tracktrigger ) TTStubAlgorithm_official_Phase2TrackerDigi_.zMatchingPS = cms.bool(True) diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py index d10d1df76f0d2..7d711445afe4e 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -63,12 +63,6 @@ _phase2_siml1emulator = SimL1EmulatorTask.copy() _phase2_siml1emulator.add(hgcalTriggerPrimitivesTask) -from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal -#phase2_hgcal.toReplaceWith( SimL1EmulatorTask , _phase2_siml1emulator ) - -from Configuration.Eras.Modifier_phase2_hgcalV11_cff import phase2_hgcalV11 -(phase2_hgcal & ~phase2_hgcalV11).toReplaceWith( SimL1EmulatorTask, _phase2_siml1emulator ) - #%% # Barrel EGamma #%% # ######################################################################## from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import * @@ -98,4 +92,5 @@ from Configuration.Eras.Modifier_phase2_trigger_cff import phase2_trigger -phase2_trigger.toReplaceWith( SimL1EmulatorTask , _phase2_siml1emulator) +from Configuration.Eras.Modifier_phase2_trigger_cff import phase2_trackerV14 +(phase2_trigger & phase2_trackerV14).toReplaceWith( SimL1EmulatorTask , _phase2_siml1emulator)