Merge pull request #36930 from tvami/L1TCaloGeomBackport122X

[122X] L1T: remove l1ExtraParticles from stage 2 reco and its consuption in DQM
cms-sw · Feb 11, 2022 · df06cdd · df06cdd
2 parents 3052139 + da8862c
commit df06cdd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/HLTriggerOffline/Exotica/python/hltExoticaValidator_cfi.py b/HLTriggerOffline/Exotica/python/hltExoticaValidator_cfi.py
@@ -232,3 +232,7 @@
     DSTMuons         = DSTMuonsPSet,
     TracklessJets    = TracklessJetsPSet
 )
+
+from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
+stage2L1Trigger.toModify(hltExoticaValidator, METplusTrack = dict(l1METLabel = None))
+
diff --git a/L1Trigger/Configuration/python/L1TReco_cff.py b/L1Trigger/Configuration/python/L1TReco_cff.py
@@ -52,12 +52,12 @@ def config_L1ExtraForStage2Sim(coll):
 stage1L1Trigger.toReplaceWith(L1Reco, cms.Sequence(l1extraParticles))
 
 #
-# Stage-2 Trigger:  fow now, reco Stage-1 as before:
+# Stage-2 Trigger
 #
 from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
 stage2L1Trigger.toReplaceWith(L1Reco_L1Extra,cms.Sequence())
 stage2L1Trigger.toReplaceWith(L1Reco_L1Extra_L1GtRecord,cms.Sequence())
-stage2L1Trigger.toReplaceWith(L1Reco, cms.Sequence(l1extraParticles))
+stage2L1Trigger.toReplaceWith(L1Reco, cms.Sequence())
 
 #
 # l1L1GtObjectMap does not work properly with fastsim