Skip to content

Commit 83fe29e

Browse files
author
Max Zhao
committed
Changes for L1 concerns about emulator sequence and plot titles
1 parent 274119f commit 83fe29e

File tree

2 files changed

+28
-100
lines changed

2 files changed

+28
-100
lines changed

‎DQM/L1TMonitor/python/L1TCaloLayer1Summary_cff.py‎

Lines changed: 7 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
4-
from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
5-
from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
6-
7-
from L1Trigger.Configuration.SimL1Emulator_cff import *
83
from L1Trigger.Configuration.CaloTriggerPrimitives_cff import *
94
simEcalTriggerPrimitiveDigis.Label = 'ecalDigis'
105
simHcalTriggerPrimitiveDigis.inputLabel = cms.VInputTag(
@@ -15,95 +10,13 @@
1510
cms.InputTag('hcalDigis'),
1611
cms.InputTag('hcalDigis')
1712
)
18-
simDtTriggerPrimitiveDigis.digiTag = cms.InputTag("muonDTDigis")
19-
simCscTriggerPrimitiveDigis.CSCComparatorDigiProducer = cms.InputTag( 'muonCSCDigis', 'MuonCSCComparatorDigi')
20-
simCscTriggerPrimitiveDigis.CSCWireDigiProducer = cms.InputTag( 'muonCSCDigis', 'MuonCSCWireDigi' )
21-
L1TReEmul = cms.Sequence(simEcalTriggerPrimitiveDigis * simHcalTriggerPrimitiveDigis * SimL1Emulator)
22-
23-
from L1Trigger.L1TCaloLayer1.simCaloStage2Layer1Summary_cfi import simCaloStage2Layer1Summary as _simCaloStage2Layer1Summary
24-
cicadaEmulFromDigis = _simCaloStage2Layer1Summary.clone(caloLayer1Regions = cms.InputTag("caloLayer1Digis", ""))
25-
L1TReEmul.replace(simCaloStage2Layer1Summary, cicadaEmulFromDigis)
26-
27-
# TwinMux
28-
stage2L1Trigger.toModify(simTwinMuxDigis,
29-
RPC_Source = 'rpcTwinMuxRawToDigi',
30-
DTDigi_Source = 'twinMuxStage2Digis:PhIn',
31-
DTThetaDigi_Source = 'twinMuxStage2Digis:ThIn'
32-
)
33-
# BMTF
34-
stage2L1Trigger.toModify(simBmtfDigis,
35-
DTDigi_Source = "simTwinMuxDigis",
36-
DTDigi_Theta_Source = "bmtfDigis"
37-
)
38-
# KBMTF
39-
stage2L1Trigger.toModify(simKBmtfStubs,
40-
srcPhi = 'simTwinMuxDigis',
41-
srcTheta = 'bmtfDigis'
42-
)
43-
# OMTF
44-
stage2L1Trigger.toModify(simOmtfDigis,
45-
srcRPC = 'muonRPCDigis',
46-
srcCSC = 'csctfDigis',
47-
srcDTPh = 'bmtfDigis',
48-
srcDTTh = 'bmtfDigis'
49-
)
50-
# EMTF
51-
stage2L1Trigger.toModify(simEmtfDigis,
52-
CSCInput = 'emtfStage2Digis',
53-
RPCInput = 'muonRPCDigis'
54-
)
55-
# Calo Layer1
56-
stage2L1Trigger.toModify(simCaloStage2Layer1Digis,
57-
ecalToken = 'ecalDigis:EcalTriggerPrimitives',
58-
hcalToken = 'hcalDigis:'
59-
)
60-
61-
(~stage2L1Trigger).toModify(simRctDigis,
62-
ecalDigis = ['ecalDigis:EcalTriggerPrimitives'],
63-
hcalDigis = ['hcalDigis:']
64-
)
65-
(~stage2L1Trigger).toModify(simRpcTriggerDigis, label = 'muonRPCDigis')
6613

67-
# if not hasattr(process, 'L1TReEmulPath'):
68-
# process.L1TReEmulPath = cms.Path(process.L1TReEmul)
69-
# process.schedule.append(process.L1TReEmulPath)
14+
from L1Trigger.L1TCaloLayer1.simCaloStage2Layer1Summary_cfi import *
15+
from L1Trigger.L1TCaloLayer1.simCaloStage2Layer1Digis_cfi import *
16+
from DQM.L1TMonitor.L1TCaloLayer1Summary_cfi import *
7017

71-
stage2L1Trigger_2017.toModify(simOmtfDigis,
72-
srcRPC = 'omtfStage2Digis',
73-
srcCSC = 'omtfStage2Digis',
74-
srcDTPh = 'omtfStage2Digis',
75-
srcDTTh = 'omtfStage2Digis'
76-
)
77-
78-
stage2L1Trigger.toModify(simEmtfDigis,
79-
CSCInput = cms.InputTag('emtfStage2Digis'),
80-
RPCInput = cms.InputTag('muonRPCDigis'),
81-
CPPFInput = cms.InputTag('emtfStage2Digis'),
82-
GEMEnable = cms.bool(False),
83-
GEMInput = cms.InputTag('muonGEMPadDigis'),
84-
CPPFEnable = cms.bool(True), # Use CPPF-emulated clustered RPC hits from CPPF as the RPC hits
85-
)
86-
87-
run3_GEM.toModify(simMuonGEMPadDigis,
88-
InputCollection = 'muonGEMDigis',
89-
)
90-
91-
run3_GEM.toModify(simTwinMuxDigis,
92-
RPC_Source = 'rpcTwinMuxRawToDigi',
93-
DTDigi_Source = 'simDtTriggerPrimitiveDigis',
94-
DTThetaDigi_Source = 'simDtTriggerPrimitiveDigis'
95-
)
96-
97-
run3_GEM.toModify(simKBmtfStubs,
98-
srcPhi = 'bmtfDigis',
99-
srcTheta = 'bmtfDigis'
100-
)
101-
102-
run3_GEM.toModify(simBmtfDigis,
103-
DTDigi_Source = 'bmtfDigis',
104-
DTDigi_Theta_Source = 'bmtfDigis'
105-
)
18+
simCaloStage2Layer1Summary.caloLayer1Regions = cms.InputTag("caloLayer1Digis", "")
19+
simCaloStage2Layer1Digis.ecalToken = cms.InputTag("ecalDigis", "EcalTriggerPrimitives")
20+
simCaloStage2Layer1Digis.hcalToken = cms.InputTag("hcalDigis", "")
10621

107-
from DQM.L1TMonitor.L1TCaloLayer1Summary_cfi import l1tCaloLayer1Summary as _l1tCaloLayer1Summary
108-
l1tCaloLayer1Summary = _l1tCaloLayer1Summary.clone(simCICADAScore = cms.InputTag("cicadaEmulFromDigis", "CICADAScore"))
109-
l1tCaloLayer1SummarySeq = cms.Sequence(L1TReEmul * l1tCaloLayer1Summary)
22+
l1tCaloLayer1SummarySeq = cms.Sequence(simEcalTriggerPrimitiveDigis * simHcalTriggerPrimitiveDigis * simCaloStage2Layer1Digis * simCaloStage2Layer1Summary * l1tCaloLayer1Summary)

‎DQM/L1TMonitor/src/L1TCaloLayer1Summary.cc‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,30 @@ void L1TCaloLayer1Summary::bookHistograms(DQMStore::IBooker& ibooker, edm::Run c
102102
histoCaloLayer1CICADAScore = ibooker.book1D("caloLayer1CICADAScore", "CaloLayer1 CICADAScore", 50, 0, 200);
103103
histoGtCICADAScore = ibooker.book1D("gtCICADAScore", "GT CICADAScore at BX0", 50, 0, 200);
104104
histoCaloMinusGt = ibooker.book1D("caloMinusGtCICADAScore", "CaloLayer1 - GT CICADAScore at BX0", 50, -50, 50);
105-
histoSimCICADAScore = ibooker.book1D("simCaloLayer1CICADAScore", "simCaloLayer1 CICADAScore", 50, 0, 200);
106-
histoCaloMinusSim = ibooker.book1D("caloMinusSimCICADAScore", "CaloLayer1 - simCaloLayer1 CICADAScore", 50, -50, 50);
105+
histoSimCICADAScore =
106+
ibooker.book1D("simCaloLayer1CICADAScore", "simCaloLayer1 CICADAScore (input: DAQ regions)", 50, 0, 200);
107+
histoCaloMinusSim = ibooker.book1D(
108+
"caloMinusSimCICADAScore", "CaloLayer1 - simCaloLayer1 (input: DAQ regions) CICADAScore", 50, -50, 50);
107109

108110
ibooker.setCurrentFolder(histFolder_ + "/Regions");
109-
histoCaloMinusSimRegions = ibooker.book2D(
110-
"caloMinusSumRegions", "CaloLayer1 - simCaloLayer1 Regions;Region;ET", 252, -0.5, 252.5, 100, -400, 400);
111+
histoCaloMinusSimRegions =
112+
ibooker.book2D("caloMinusSumRegions",
113+
"CaloLayer1 - simCaloLayer1 (input: DAQ trigger primatives) Regions;Region;ET Difference",
114+
252,
115+
-0.5,
116+
252.5,
117+
100,
118+
-400,
119+
400);
111120
histoCaloRegions = ibooker.book2D("caloLayer1Regions", "CaloLayer1 Regions;Region;ET", 252, -0.5, 252.5, 100, 0, 800);
112-
histoSimRegions =
113-
ibooker.book2D("simCaloLayer1Regions", "simCaloLayer1 Regions;Region;ET", 252, -0.5, 252.5, 100, 0, 800);
121+
histoSimRegions = ibooker.book2D("simCaloLayer1Regions",
122+
"simCaloLayer1 Regions (input: DAQ trigger primatives);Region;ET",
123+
252,
124+
-0.5,
125+
252.5,
126+
100,
127+
0,
128+
800);
114129
}
115130

116131
// ------------ method fills 'descriptions' with the allowed parameters for the module ------------

0 commit comments

Comments
 (0)