From 25d91f282ed39ca62ba66cbf312af83364a58de1 Mon Sep 17 00:00:00 2001 From: Silvio Date: Wed, 1 Jul 2020 09:48:37 +0200 Subject: [PATCH 1/2] run L1TrackTrigger befor L1 --- Configuration/PyReleaseValidation/python/relval_steps.py | 2 +- Validation/Geometry/test/runMaterialDumpAnalyser_PhaseII.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 9d5cd61d812f0..d2e79389d4344 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3265,7 +3265,7 @@ def gen2021HiMix(fragment,howMuch): } # Adding Track trigger step in step2 - upgradeStepDict['DigiFullTrigger'][k] = {'-s':'DIGI:pdigi_valid,L1,L1TrackTrigger,DIGI2RAW,HLT:%s'%(hltversion), + upgradeStepDict['DigiFullTrigger'][k] = {'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,DIGI2RAW,HLT:%s'%(hltversion), '--conditions':gt, '--datatier':'GEN-SIM-DIGI-RAW', '-n':'10', diff --git a/Validation/Geometry/test/runMaterialDumpAnalyser_PhaseII.sh b/Validation/Geometry/test/runMaterialDumpAnalyser_PhaseII.sh index 6967df60be721..cad59b8237a02 100755 --- a/Validation/Geometry/test/runMaterialDumpAnalyser_PhaseII.sh +++ b/Validation/Geometry/test/runMaterialDumpAnalyser_PhaseII.sh @@ -59,7 +59,7 @@ fi # DIGI comes next if checkFile SingleMuPt10_step2_DIGI_L1_DIGI2RAW_HLT_PhaseII.root ; then cmsDriver.py step2 \ --s DIGI:pdigi_valid,L1,L1TrackTrigger,DIGI2RAW,HLT:@fake2 \ +-s DIGI:pdigi_valid,L1TrackTrigger,L1,DIGI2RAW,HLT:@fake2 \ --conditions auto:phase2_realistic \ -n -1 \ --era Phase2C2 \ From aad8be6906ef4fb25cf07a75d27c9c070177b5b1 Mon Sep 17 00:00:00 2001 From: silviodonato Date: Fri, 3 Jul 2020 12:48:48 +0200 Subject: [PATCH 2/2] Turn on TrackMatch and ParticleFlow --- .../Configuration/python/SimL1Emulator_cff.py | 79 ++++++++++++++++++- 1 file changed, 75 insertions(+), 4 deletions(-) diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py index 19b37622c0e6e..24fdbe4afcf8b 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -58,10 +58,81 @@ # soon to be removed when availble in GTs from L1Trigger.L1TTwinMux.fakeTwinMuxParams_cff import * -# Customisation for the phase2_hgcal era. Includes the HGCAL L1 trigger -from L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import * _phase2_siml1emulator = SimL1EmulatorTask.copy() + +# ######################################################################## +# ######################################################################## +# +# Phase-2 +# +# ######################################################################## +# ######################################################################## + +# ######################################################################## +# Phase-2 Trigger Primitives +# ######################################################################## + +# HGCAL TP +# ######################################################################## +from L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import * _phase2_siml1emulator.add(hgcalTriggerPrimitivesTask) + +# ######################################################################## +# Phase 2 L1T +# ######################################################################## + +# Barrel and EndCap EGamma +# ######################################################################## + +from L1Trigger.L1CaloTrigger.L1EGammaCrystalsEmulatorProducer_cfi import * +_phase2_siml1emulator.add(L1EGammaClusterEmuProducer) + +from L1Trigger.L1CaloTrigger.l1EGammaEEProducer_cfi import * +_phase2_siml1emulator.add(l1EGammaEEProducer) + +# ######################################################################## +# Phase-2 L1T - TrackTrigger dependent modules +# ######################################################################## + +# Tk + StandaloneObj, including L1TkPrimaryVertex +# ######################################################################## +from L1Trigger.L1TTrackMatch.L1TkObjectProducers_cff import * + +_phase2_siml1emulator.add(L1TkPrimaryVertex) + +_phase2_siml1emulator.add(L1TkElectronsCrystal) +_phase2_siml1emulator.add(L1TkElectronsLooseCrystal) +_phase2_siml1emulator.add(L1TkElectronsEllipticMatchCrystal) +_phase2_siml1emulator.add(L1TkIsoElectronsCrystal) +_phase2_siml1emulator.add(L1TkPhotonsCrystal) + +_phase2_siml1emulator.add(L1TkElectronsHGC) +_phase2_siml1emulator.add(L1TkElectronsEllipticMatchHGC) +_phase2_siml1emulator.add(L1TkIsoElectronsHGC) +_phase2_siml1emulator.add(L1TkPhotonsHGC) + +_phase2_siml1emulator.add( L1TkMuons ) + +# PF Candidates +# ######################################################################## +from L1Trigger.Phase2L1ParticleFlow.l1ParticleFlow_cff import * +_phase2_siml1emulator.add(l1ParticleFlowTask) + +# PF JetMET +# ######################################################################## +from L1Trigger.Phase2L1ParticleFlow.l1pfJetMet_cff import * +# Describe here l1PFJets Task +# ############################### +l1PFJetsTask = cms.Task( + ak4PFL1Calo , ak4PFL1PF , ak4PFL1Puppi , + ak4PFL1CaloCorrected , ak4PFL1PFCorrected , ak4PFL1PuppiCorrected) +_phase2_siml1emulator.add(l1PFJetsTask) +# Describe here l1PFMets Task +# ############################### +l1PFMetsTask = cms.Task(l1PFMetCalo , l1PFMetPF , l1PFMetPuppi) +_phase2_siml1emulator.add(l1PFMetsTask) -from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal -phase2_hgcal.toReplaceWith( SimL1EmulatorTask , _phase2_siml1emulator ) +# --> add modules +from Configuration.Eras.Modifier_phase2_trigger_cff import phase2_trigger +from Configuration.Eras.Modifier_phase2_trackerV14_cff import phase2_trackerV14 +(phase2_trigger & phase2_trackerV14).toReplaceWith( SimL1EmulatorTask , _phase2_siml1emulator)