Revert python configuration

cms-sw · Jul 1, 2020 · f3c0589 · f3c0589
1 parent 8847327
commit f3c0589
Showing 1 changed file with 9 additions and 20 deletions.
diff --git a/L1Trigger/CSCTriggerPrimitives/python/cscTriggerPrimitiveDigis_cfi.py b/L1Trigger/CSCTriggerPrimitives/python/cscTriggerPrimitiveDigis_cfi.py
@@ -500,32 +500,20 @@
                       commonParam = dict(gangedME1a = False),
                       )
 
-## Run-3 CSC-only: new LCT data format
-from Configuration.Eras.Modifier_run3_common_cff import run3_common
-run3_common.toModify( cscTriggerPrimitiveDigis,
-                      commonParam = dict(isSLHC = True,
-                                         runME11Up = cms.bool(True),
-                                         enableAlctSLHC = cms.bool(False)),
-                      ## EMTF will take of this
-                      tmbSLHC = dict(ignoreAlctCrossClct = cms.bool(False)),
-                      clctSLHC = dict(
-                          clctNplanesHitPattern = 4,
-                      ),
-                   )
-
-## Run3: GEM-CSC ILT in ME1/1
+## GEM-CSC ILT in ME1/1
 from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
 run3_GEM.toModify( cscTriggerPrimitiveDigis,
                    GEMPadDigiProducer = cms.InputTag("simMuonGEMPadDigis"),
                    GEMPadDigiClusterProducer = cms.InputTag("simMuonGEMPadDigiClusters"),
-                   commonParam = dict(runME11ILT = cms.bool(True),
-                                      useClusters = cms.bool(False)),
-                   clctSLHC = dict(
-                       clctNplanesHitPattern = 3,
-                   ),
+                   commonParam = dict(isSLHC = True,
+                                      runME11Up = cms.bool(True),
+                                      runME11ILT = cms.bool(True),
+                                      useClusters = cms.bool(False),
+                                      enableAlctSLHC = cms.bool(True)),
+                   clctSLHC = dict(clctNplanesHitPattern = 3),
                    me11tmbSLHCGEM = me11tmbSLHCGEM,
                    copadParamGE11 = copadParamGE11
-)
+                   )
 
 ## GEM-CSC ILT in ME2/1, CSC in ME3/1 and ME4/1
 from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon
@@ -534,6 +522,7 @@
                                          runME21ILT = cms.bool(True),
                                          runME31Up = cms.bool(True),
                                          runME41Up = cms.bool(True)),
+                      tmbSLHC = dict(ignoreAlctCrossClct = cms.bool(False)),
                       clctSLHC = dict(useDynamicStateMachineZone = cms.bool(True)),
                       alctSLHCME21 = cscTriggerPrimitiveDigis.alctSLHC.clone(alctNplanesHitPattern = 3),
                       clctSLHCME21 = cscTriggerPrimitiveDigis.clctSLHC.clone(clctNplanesHitPattern = 3),