Merge pull request #16794 from cms-l1t-offline/pr90x-l1t-pack-ext

pr90x L1T GT packer of ExternalConditions
cms-sw · Dec 14, 2016 · cddbf19 · cddbf19
2 parents 49989a4 + 8b92951
commit cddbf19
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 35 deletions.
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py
@@ -11,42 +11,30 @@
     print "L1T INFO:  L1REPACK:uGT (intended for 2016 data) will unpack uGMT and CaloLaye2 outputs and re-emulate uGT"
 
     # First, inputs to uGT:
-    import EventFilter.L1TRawToDigi.gmtStage2Digis_cfi
-    unpackGmtStage2 = EventFilter.L1TRawToDigi.gmtStage2Digis_cfi.gmtStage2Digis.clone(
-        InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess()))    
-
-    import EventFilter.L1TRawToDigi.caloStage2Digis_cfi
-    unpackCaloStage2 = EventFilter.L1TRawToDigi.caloStage2Digis_cfi.caloStage2Digis.clone(
+    import EventFilter.L1TRawToDigi.gtStage2Digis_cfi
+    unpackGtStage2 = EventFilter.L1TRawToDigi.gtStage2Digis_cfi.gtStage2Digis.clone(
         InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess()))    
 
     from L1Trigger.Configuration.SimL1Emulator_cff import *
-    simGtStage2Digis.MuonInputTag   = cms.InputTag("unpackGmtStage2","Muon")
-    simGtStage2Digis.EGammaInputTag = cms.InputTag("unpackCaloStage2","EGamma")
-    simGtStage2Digis.TauInputTag    = cms.InputTag("unpackCaloStage2","Tau")
-    simGtStage2Digis.JetInputTag    = cms.InputTag("unpackCaloStage2","Jet")
-    simGtStage2Digis.EtSumInputTag  = cms.InputTag("unpackCaloStage2","EtSum")
-    simGtStage2Digis.ExtInputTag    = cms.InputTag("simGtExtFakeStage2Digis") # as in default
+    simGtStage2Digis.MuonInputTag   = cms.InputTag("unpackGtStage2","Muon")
+    simGtStage2Digis.EGammaInputTag = cms.InputTag("unpackGtStage2","EGamma")
+    simGtStage2Digis.TauInputTag    = cms.InputTag("unpackGtStage2","Tau")
+    simGtStage2Digis.JetInputTag    = cms.InputTag("unpackGtStage2","Jet")
+    simGtStage2Digis.EtSumInputTag  = cms.InputTag("unpackGtStage2","EtSum")
+    simGtStage2Digis.ExtInputTag    = cms.InputTag("unpackGtStage2") # as in default
 
 
     # Finally, pack the new L1T output back into RAW
 
-    # pack unpacked
-    from EventFilter.L1TRawToDigi.caloStage2Raw_cfi import caloStage2Raw as packCaloStage2
-    packCaloStage2.InputLabel = cms.InputTag("unpackCaloStage2")
-
-    # pack unpacked
-    from EventFilter.L1TRawToDigi.gmtStage2Raw_cfi import gmtStage2Raw as packGmtStage2
-    packGmtStage2.InputLabel = cms.InputTag("unpackGmtStage2")
-
     # pack simulated uGT
     from EventFilter.L1TRawToDigi.gtStage2Raw_cfi import gtStage2Raw as packGtStage2
-    packGtStage2.MuonInputTag   = cms.InputTag("unpackGmtStage2","Muon")
-    packGtStage2.EGammaInputTag = cms.InputTag("unpackCaloStage2","EGamma")
-    packGtStage2.TauInputTag    = cms.InputTag("unpackCaloStage2","Tau")
-    packGtStage2.JetInputTag    = cms.InputTag("unpackCaloStage2","Jet")
-    packGtStage2.EtSumInputTag  = cms.InputTag("unpackCaloStage2","EtSum")
+    packGtStage2.MuonInputTag   = cms.InputTag("unpackGtStage2","Muon")
+    packGtStage2.EGammaInputTag = cms.InputTag("unpackGtStage2","EGamma")
+    packGtStage2.TauInputTag    = cms.InputTag("unpackGtStage2","Tau")
+    packGtStage2.JetInputTag    = cms.InputTag("unpackGtStage2","Jet")
+    packGtStage2.EtSumInputTag  = cms.InputTag("unpackGtStage2","EtSum")
     packGtStage2.GtInputTag     = cms.InputTag("simGtStage2Digis") # as in default
-    packGtStage2.ExtInputTag    = cms.InputTag("simGtStage2Digis") # as in default
+    packGtStage2.ExtInputTag    = cms.InputTag("unpackGtStage2") # as in default
 
 
     # combine the new L1 RAW with existing RAW for other FEDs
@@ -61,9 +49,7 @@
 
 
 
-    SimL1Emulator = cms.Sequence(unpackGmtStage2
-                                +unpackCaloStage2
-                                +SimL1TechnicalTriggers
+    SimL1Emulator = cms.Sequence(unpackGtStage2
                                 +SimL1TGlobal
                                 +packGtStage2
                                 +rawDataCollector)
diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/GTSetup.cc
@@ -41,7 +41,7 @@ namespace l1t {
                PackerFactory::get()->make("stage2::GTJetPacker"),
                PackerFactory::get()->make("stage2::GTTauPacker"),
                PackerFactory::get()->make("stage2::GlobalAlgBlkPacker"),
-               //PackerFactory::get()->make("stage2::GlobalExtBlkPacker")
+               PackerFactory::get()->make("stage2::GlobalExtBlkPacker")
             };
 
          }

diff --git a/EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py b/EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py
@@ -5,7 +5,7 @@
     Setup = cms.string("stage2::GTSetup"),
 #    TowerInputLabel = cms.InputTag("simCaloStage2Digis"),
     GtInputTag = cms.InputTag("simGtStage2Digis"),
-    ExtInputTag = cms.InputTag("simGtStage2Digis"),
+    ExtInputTag = cms.InputTag("simGtExtFakeStage2Digis"),
     MuonInputTag   = cms.InputTag("simGmtStage2Digis"),
     EGammaInputTag = cms.InputTag("simCaloStage2Digis"),
     TauInputTag    = cms.InputTag("simCaloStage2Digis"),

diff --git a/L1Trigger/Configuration/python/customiseUtils.py b/L1Trigger/Configuration/python/customiseUtils.py
@@ -66,7 +66,7 @@ def L1TGlobalDigisSummary(process):
         'L1TGlobalSummary',
         AlgInputTag = cms.InputTag("gtStage2Digis"),
         ExtInputTag = cms.InputTag("gtStage2Digis"),
-        DumpTrigResults = cms.bool(True), # per event dump of trig results
+        DumpTrigResults = cms.bool(False), # per event dump of trig results
         DumpTrigSummary = cms.bool(True), # pre run dump of trig results
         )
     process.l1tglobalsummary = cms.Path(process.l1tGlobalSummary)
@@ -81,15 +81,15 @@ def L1TGlobalMenuXML(process):
 
 def L1TGlobalSimDigisSummary(process):
     print "L1T INFO:  will dump a summary of simulated L1T Global output to screen."    
-    process.l1tGlobalSummary = cms.EDAnalyzer(
+    process.l1tSimGlobalSummary = cms.EDAnalyzer(
         'L1TGlobalSummary',
         AlgInputTag = cms.InputTag("simGtStage2Digis"),
         ExtInputTag = cms.InputTag("simGtStage2Digis"),
         DumpTrigResults = cms.bool(False), # per event dump of trig results
         DumpTrigSummary = cms.bool(True), # pre run dump of trig results
         )
-    process.l1tglobalsummary = cms.Path(process.l1tGlobalSummary)
-    process.schedule.append(process.l1tglobalsummary)
+    process.l1tsimglobalsummary = cms.Path(process.l1tSimGlobalSummary)
+    process.schedule.append(process.l1tsimglobalsummary)
     return process
 
 def L1TAddInfoOutput(process):