diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py index 28c4e0debd63e..fadeac86e278b 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py @@ -90,6 +90,9 @@ simCaloStage2Layer1Digis.ecalToken = 'unpackEcal:EcalTriggerPrimitives' simCaloStage2Layer1Digis.hcalToken = 'simHcalTriggerPrimitiveDigis' +# ZDC EtSums +l1tZDCEtSums.hcalTPDigis = 'unpackHcal' + # Finally, pack the new L1T output back into RAW from EventFilter.L1TRawToDigi.caloStage2Raw_cfi import caloStage2Raw as packCaloStage2 from EventFilter.L1TRawToDigi.gmtStage2Raw_cfi import gmtStage2Raw as packGmtStage2 diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py index 870c58e186f89..cf9c0cfef67ce 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py @@ -124,9 +124,12 @@ simEmtfDigis.CSCInput = "unpackEmtf" simEmtfDigis.RPCInput = 'unpackRPC' +# Calo Layer-1 simCaloStage2Layer1Digis.ecalToken = 'unpackEcal:EcalTriggerPrimitives' simCaloStage2Layer1Digis.hcalToken = 'unpackHcal' +# ZDC EtSums +l1tZDCEtSums.hcalTPDigis = 'unpackHcal' ## GT stage2L1Trigger_2017.toModify(simGtExtFakeStage2Digis, diff --git a/EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py b/EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py index e99e0f08ff43d..ba238ce334b93 100644 --- a/EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py +++ b/EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py @@ -12,7 +12,7 @@ TauInputTag = cms.InputTag("simCaloStage2Digis"), JetInputTag = cms.InputTag("simCaloStage2Digis"), EtSumInputTag = cms.InputTag("simCaloStage2Digis"), - EtSumZDCInputTag = cms.InputTag("simCaloStage2Digis"), + EtSumZDCInputTag = cms.InputTag("l1tZDCEtSums"), FedId = cms.int32(1404), FWId = cms.uint32(0x1150), # FW w/ 2loose hadronic showers. lenSlinkHeader = cms.untracked.int32(8), diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py index 9954d8c8e3357..3c0e1b8c11580 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -30,10 +30,10 @@ # so these missing (required!) inputs are presently ignored by downstream modules. # -from L1Trigger.Configuration.SimL1TechnicalTriggers_cff import * - from L1Trigger.L1TCalorimeter.simDigis_cff import * from L1Trigger.L1TMuon.simDigis_cff import * +from L1Trigger.Configuration.SimL1TechnicalTriggers_cff import * +from L1Trigger.L1TZDC.L1TZDCEmulation_cff import * from L1Trigger.L1TGlobal.simDigis_cff import * # define a core which can be extented in customizations: @@ -41,6 +41,7 @@ SimL1TCalorimeterTask, SimL1TMuonTask, SimL1TechnicalTriggersTask, + L1TZDCEmulationTask, SimL1TGlobalTask ) SimL1EmulatorCore = cms.Sequence(SimL1EmulatorCoreTask) diff --git a/L1Trigger/L1TGlobal/python/simGtStage2Digis_cfi.py b/L1Trigger/L1TGlobal/python/simGtStage2Digis_cfi.py index 4916c8647d018..ce5c7f9c98317 100644 --- a/L1Trigger/L1TGlobal/python/simGtStage2Digis_cfi.py +++ b/L1Trigger/L1TGlobal/python/simGtStage2Digis_cfi.py @@ -15,7 +15,7 @@ TauInputTag = cms.InputTag("simCaloStage2Digis"), JetInputTag = cms.InputTag("simCaloStage2Digis"), EtSumInputTag = cms.InputTag("simCaloStage2Digis"), - EtSumZdcInputTag = cms.InputTag("etSumZdcProducer"), + EtSumZdcInputTag = cms.InputTag("l1tZDCEtSums"), CICADAInputTag = cms.InputTag("simCaloStage2Layer1Summary", "CICADAScore"), AlgorithmTriggersUnmasked = cms.bool(True), AlgorithmTriggersUnprescaled = cms.bool(True), diff --git a/L1Trigger/L1TGlobal/test/testVectorCode_data.py b/L1Trigger/L1TGlobal/test/testVectorCode_data.py index 185194a4de84a..0331764a1631d 100644 --- a/L1Trigger/L1TGlobal/test/testVectorCode_data.py +++ b/L1Trigger/L1TGlobal/test/testVectorCode_data.py @@ -177,9 +177,9 @@ process.simGtStage2Digis.TauInputTag = cms.InputTag("gtStage2Digis", "Tau") process.simGtStage2Digis.JetInputTag = cms.InputTag("gtStage2Digis", "Jet") process.simGtStage2Digis.EtSumInputTag = cms.InputTag("gtStage2Digis", "EtSum") -process.simGtStage2Digis.EtSumZdcInputTag = cms.InputTag("etSumZdcProducer") +process.simGtStage2Digis.EtSumZdcInputTag = cms.InputTag("l1tZDCEtSums") process.simGtStage2Digis.EmulateBxInEvent = cms.int32(1) - + process.dumpGTRecord = cms.EDAnalyzer("l1t::GtRecordDump", egInputTag = cms.InputTag("gtStage2Digis", "EGamma"), muInputTag = cms.InputTag("gtStage2Digis", "Muon"), diff --git a/L1Trigger/L1TNtuples/python/L1NtupleEMU_cff.py b/L1Trigger/L1TNtuples/python/L1NtupleEMU_cff.py index 911aee007008c..93103fb0da418 100644 --- a/L1Trigger/L1TNtuples/python/L1NtupleEMU_cff.py +++ b/L1Trigger/L1TNtuples/python/L1NtupleEMU_cff.py @@ -19,7 +19,7 @@ l1UpgradeEmuTree = l1UpgradeTree.clone() # We have only output of the ZDC emulator available, no info from unpacker: l1UpgradeEmuTree clones from the l1UpgradeTree -l1UpgradeEmuTree.sumZDCToken = cms.untracked.InputTag("etSumZdcProducer") +l1UpgradeEmuTree.sumZDCToken = cms.untracked.InputTag("l1tZDCEtSums") l1CaloTowerEmuTree = l1CaloTowerTree.clone() l1CaloTowerEmuTree.ecalToken = cms.untracked.InputTag("simEcalTriggerPrimitiveDigis") diff --git a/L1Trigger/L1TNtuples/python/L1NtupleRAW_cff.py b/L1Trigger/L1TNtuples/python/L1NtupleRAW_cff.py index ebf6cb90069f7..49d4718e0e7ee 100644 --- a/L1Trigger/L1TNtuples/python/L1NtupleRAW_cff.py +++ b/L1Trigger/L1TNtuples/python/L1NtupleRAW_cff.py @@ -15,7 +15,7 @@ # we don't have emtfDigis yet, use unpacked input payloads of GMT l1UpgradeTfMuonTree.emtfMuonToken = cms.untracked.InputTag("gmtStage2Digis","EMTF") # We have only output of the ZDC emulator available, no info from unpacker -l1UpgradeTree.sumZDCToken = cms.untracked.InputTag("etSumZdcProducer") +l1UpgradeTree.sumZDCToken = cms.untracked.InputTag("l1tZDCEtSums") L1NtupleRAW = cms.Sequence( l1EventTree diff --git a/L1Trigger/L1TNtuples/python/l1UpgradeTree_cfi.py b/L1Trigger/L1TNtuples/python/l1UpgradeTree_cfi.py index bce1289cec4c6..e044dd87b0028 100644 --- a/L1Trigger/L1TNtuples/python/l1UpgradeTree_cfi.py +++ b/L1Trigger/L1TNtuples/python/l1UpgradeTree_cfi.py @@ -9,7 +9,7 @@ muonShowerToken = cms.untracked.InputTag("simGmtShowerDigis"), muonLegacyToken = cms.untracked.InputTag("muonLegacyInStage2FormatDigis","legacyMuon"), sumToken = cms.untracked.InputTag("caloStage2Digis","EtSum"), - sumZDCToken = cms.untracked.InputTag("etSumZdcProducer"), + sumZDCToken = cms.untracked.InputTag("l1tZDCEtSums"), maxL1Upgrade = cms.uint32(60) ) diff --git a/L1Trigger/L1TZDC/plugins/L1TZDCAnalyzer.cc b/L1Trigger/L1TZDC/plugins/L1TZDCAnalyzer.cc index ab192412dcc23..43c061535401b 100644 --- a/L1Trigger/L1TZDC/plugins/L1TZDCAnalyzer.cc +++ b/L1Trigger/L1TZDC/plugins/L1TZDCAnalyzer.cc @@ -127,7 +127,7 @@ namespace l1t { void L1TZDCAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("etSumTag", edm::InputTag("etSumZdcProducer", "")); + desc.add("etSumTag", edm::InputTag("l1tZDCEtSums", "")); descriptions.add("l1tZDCAnalyzer", desc); } diff --git a/L1Trigger/L1TZDC/python/L1TZDCEmulation_cff.py b/L1Trigger/L1TZDC/python/L1TZDCEmulation_cff.py new file mode 100644 index 0000000000000..8a8645719dc11 --- /dev/null +++ b/L1Trigger/L1TZDC/python/L1TZDCEmulation_cff.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +from L1Trigger.L1TZDC.l1tZDCEtSums_cfi import l1tZDCEtSums + +L1TZDCEmulationTask = cms.Task( + l1tZDCEtSums +) diff --git a/L1Trigger/L1TZDC/python/etSumZdcAnalyzer_cfi.py b/L1Trigger/L1TZDC/python/etSumZdcAnalyzer_cfi.py index 1a0ef85d2165a..2fe3fdc06a322 100644 --- a/L1Trigger/L1TZDC/python/etSumZdcAnalyzer_cfi.py +++ b/L1Trigger/L1TZDC/python/etSumZdcAnalyzer_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms etSumZdcAnalyzer = cms.EDAnalyzer('L1TZDCAnalyzer', - etSumTag = cms.InputTag("etSumZdcProducer") + etSumTag = cms.InputTag("l1tZDCEtSums") ) diff --git a/L1Trigger/L1TZDC/python/etSumZdcProducer_cfi.py b/L1Trigger/L1TZDC/python/etSumZdcProducer_cfi.py deleted file mode 100644 index 990f547e247b4..0000000000000 --- a/L1Trigger/L1TZDC/python/etSumZdcProducer_cfi.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -etSumZdcProducer = cms.EDProducer('L1TZDCProducer', - hcalTPDigis = cms.InputTag("simHcalTriggerPrimitiveDigis"), - bxFirst = cms.int32(-2), - bxLast = cms.int32(3) - ) - diff --git a/L1Trigger/L1TZDC/python/l1tZDCEtSums_cfi.py b/L1Trigger/L1TZDC/python/l1tZDCEtSums_cfi.py new file mode 100644 index 0000000000000..e7344cc6ed14a --- /dev/null +++ b/L1Trigger/L1TZDC/python/l1tZDCEtSums_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +from L1Trigger.L1TZDC.l1tZDCProducer_cfi import l1tZDCProducer as _l1tZDCProducer + +l1tZDCEtSums = _l1tZDCProducer.clone( + bxLast = 3 +)