Skip to content

Commit

Permalink
add ZDC EtSums to L1T-emulation sequence
Browse files Browse the repository at this point in the history
  • Loading branch information
missirol authored and jbabbar committed Oct 1, 2024
1 parent f72dcd5 commit 4e371f3
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/L1TRawToDigi/python/gtStage2Raw_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
5 changes: 3 additions & 2 deletions L1Trigger/Configuration/python/SimL1Emulator_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,18 @@
# 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:
SimL1EmulatorCoreTask = cms.Task(
SimL1TCalorimeterTask,
SimL1TMuonTask,
SimL1TechnicalTriggersTask,
L1TZDCEmulationTask,
SimL1TGlobalTask
)
SimL1EmulatorCore = cms.Sequence(SimL1EmulatorCoreTask)
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1TGlobal/python/simGtStage2Digis_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/L1TGlobal/test/testVectorCode_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1TNtuples/python/L1NtupleEMU_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1TNtuples/python/L1NtupleRAW_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1TNtuples/python/l1UpgradeTree_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)

Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1TZDC/plugins/L1TZDCAnalyzer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ namespace l1t {
void L1TZDCAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;

desc.add<edm::InputTag>("etSumTag", edm::InputTag("etSumZdcProducer", ""));
desc.add<edm::InputTag>("etSumTag", edm::InputTag("l1tZDCEtSums", ""));
descriptions.add("l1tZDCAnalyzer", desc);
}

Expand Down
7 changes: 7 additions & 0 deletions L1Trigger/L1TZDC/python/L1TZDCEmulation_cff.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

from L1Trigger.L1TZDC.l1tZDCEtSums_cfi import l1tZDCEtSums

L1TZDCEmulationTask = cms.Task(
l1tZDCEtSums
)
2 changes: 1 addition & 1 deletion L1Trigger/L1TZDC/python/etSumZdcAnalyzer_cfi.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import FWCore.ParameterSet.Config as cms

etSumZdcAnalyzer = cms.EDAnalyzer('L1TZDCAnalyzer',
etSumTag = cms.InputTag("etSumZdcProducer")
etSumTag = cms.InputTag("l1tZDCEtSums")
)
8 changes: 0 additions & 8 deletions L1Trigger/L1TZDC/python/etSumZdcProducer_cfi.py

This file was deleted.

7 changes: 7 additions & 0 deletions L1Trigger/L1TZDC/python/l1tZDCEtSums_cfi.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

from L1Trigger.L1TZDC.l1tZDCProducer_cfi import l1tZDCProducer as _l1tZDCProducer

l1tZDCEtSums = _l1tZDCProducer.clone(
bxLast = 3
)

0 comments on commit 4e371f3

Please sign in to comment.