Skip to content

Commit 67b159d

Browse files
author
Benjamin Huber
committed
Update muon quality interface
1 parent 06b768f commit 67b159d

File tree

7 files changed

+65
-65
lines changed

7 files changed

+65
-65
lines changed

L1Trigger/Phase2L1GT/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@ process.TripleTkMuon533 = l1tGTTripleObjectCond.clone(
6868
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
6969
minPt = cms.double(5),
7070
maxAbsEta = cms.double(2.4),
71-
minQualityScore = cms.uint32(0)
71+
qualityFlags = cms.uint32(0b0001)
7272
),
7373
collection2 = cms.PSet(
7474
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
7575
minPt = cms.double(3),
7676
maxAbsEta = cms.double(2.4),
77-
minQualityScore = cms.uint32(0)
77+
qualityFlags = cms.uint32(0b0001)
7878
),
7979
collection3 = cms.PSet(
8080
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
8181
minPt = cms.double(3),
8282
maxAbsEta = cms.double(2.4),
83-
minQualityScore = cms.uint32(0)
83+
qualityFlags = cms.uint32(0b0001)
8484
),
8585
# Correlations are ambiguous (can be {1,2}, {1,3}, or {2,3}), correlXY PSets are thus required.
8686
correl12 = cms.PSet(

L1Trigger/Phase2L1GT/plugins/L1GTProducer.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ namespace l1t {
353353
gtObj.hwPhi_ = obj.apPhi().to_int();
354354
gtObj.hwEta_ = obj.apEta().to_int();
355355
gtObj.hwZ0_ = hwZ0;
356-
gtObj.hwQualityScore_ = obj.apQualFlags().to_int();
356+
gtObj.hwQualityFlags_ = obj.apQualFlags().to_int();
357357
gtObj.hwIsolationPT_ = obj.apIso().to_int();
358358
gtObj.hwCharge_ = obj.apCharge().to_int();
359359
gtObj.hwD0_ = obj.apD0().to_int();

L1Trigger/Phase2L1GT/python/l1tGTBoardWriter_cff.py

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
import FWCore.ParameterSet.Config as cms
2-
2+
from L1Trigger.Phase2L1GT.l1tGTProducer_cff import l1tGTProducer
33

44
BoardDataInput = cms.EDAnalyzer("L1GTObjectBoardWriter",
5-
GTTPromptJets = cms.InputTag("l1tTrackJetsEmulation", "L1TrackJets"),
6-
GTTDisplacedJets = cms.InputTag("l1tTrackJetsExtendedEmulation", "L1TrackJetsExtended"),
7-
GTTPromptHtSum = cms.InputTag("l1tTrackerEmuHTMiss", "L1TrackerEmuHTMiss"),
8-
GTTDisplacedHtSum = cms.InputTag("l1tTrackerEmuHTMissExtended", "L1TrackerEmuHTMissExtended"),
9-
GTTEtSum = cms.InputTag("l1tTrackerEmuEtMiss","L1TrackerEmuEtMiss"),
10-
GTTPrimaryVert = cms.InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"),
11-
GMTSaPromptMuons = cms.InputTag("l1tSAMuonsGmt", "promptSAMuons"),
12-
GMTSaDisplacedMuons = cms.InputTag("l1tSAMuonsGmt", "displacedSAMuons"),
13-
GMTTkMuons = cms.InputTag("l1tTkMuonsGmtLowPtFix", "l1tTkMuonsGmtLowPtFix"),
14-
CL2JetsSC4 = cms.InputTag("l1tSC4PFL1PuppiCorrectedEmulator"),
15-
CL2JetsSC8 = cms.InputTag("l1tSC8PFL1PuppiCorrectedEmulator"),
16-
CL2Electrons = cms.InputTag("l1tLayer2EG", "L1CtTkElectron"),
17-
CL2Photons = cms.InputTag("l1tLayer2EG", "L1CtTkEm"),
18-
CL2Taus = cms.InputTag("l1tNNTauProducerPuppi", "L1PFTausNN"),
19-
CL2EtSum = cms.InputTag("l1tMETPFProducer"),
20-
CL2HtSum = cms.InputTag("l1tSC4PFL1PuppiCorrectedEmulatorMHT"),
5+
GTTPromptJets = l1tGTProducer.GTTPromptJets,
6+
GTTDisplacedJets = l1tGTProducer.GTTDisplacedJets,
7+
GTTPromptHtSum = l1tGTProducer.GTTPromptHtSum,
8+
GTTDisplacedHtSum = l1tGTProducer.GTTDisplacedHtSum,
9+
GTTEtSum = l1tGTProducer.GTTEtSum,
10+
GTTPrimaryVert = l1tGTProducer.GTTPrimaryVert,
11+
GMTSaPromptMuons = l1tGTProducer.GMTSaPromptMuons,
12+
GMTSaDisplacedMuons = l1tGTProducer.GMTSaDisplacedMuons,
13+
GMTTkMuons = l1tGTProducer.GMTTkMuons,
14+
CL2JetsSC4 = l1tGTProducer.CL2JetsSC4,
15+
CL2JetsSC8 = l1tGTProducer.CL2JetsSC8,
16+
CL2Electrons = l1tGTProducer.CL2Electrons,
17+
CL2Photons = l1tGTProducer.CL2Photons,
18+
CL2Taus = l1tGTProducer.CL2Taus,
19+
CL2EtSum = l1tGTProducer.CL2EtSum,
20+
CL2HtSum = l1tGTProducer.CL2HtSum,
2121
filename = cms.string("inputPattern"),
2222
maxEvents = cms.uint32(72),
2323
bufferFileType = cms.string("input")
2424
)
2525

2626
BoardDataOutputObjects = cms.EDAnalyzer("L1GTObjectBoardWriter",
27-
GTTPromptJets = cms.InputTag("l1tTrackJetsEmulation", "L1TrackJets"),
28-
GTTDisplacedJets = cms.InputTag("l1tTrackJetsExtendedEmulation", "L1TrackJetsExtended"),
29-
GTTPromptHtSum = cms.InputTag("l1tTrackerEmuHTMiss", "L1TrackerEmuHTMiss"),
30-
GTTDisplacedHtSum = cms.InputTag("l1tTrackerEmuHTMissExtended", "L1TrackerEmuHTMissExtended"),
31-
GTTEtSum = cms.InputTag("l1tTrackerEmuEtMiss","L1TrackerEmuEtMiss"),
32-
GTTPrimaryVert = cms.InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"),
33-
GMTSaPromptMuons = cms.InputTag("l1tSAMuonsGmt", "promptSAMuons"),
34-
GMTSaDisplacedMuons = cms.InputTag("l1tSAMuonsGmt", "displacedSAMuons"),
35-
GMTTkMuons = cms.InputTag("l1tTkMuonsGmtLowPtFix", "l1tTkMuonsGmtLowPtFix"),
36-
CL2JetsSC4 = cms.InputTag("l1tSC4PFL1PuppiCorrectedEmulator"),
37-
CL2JetsSC8 = cms.InputTag("l1tSC8PFL1PuppiCorrectedEmulator"),
38-
CL2Electrons = cms.InputTag("l1tLayer2EG", "L1CtTkElectron"),
39-
CL2Photons = cms.InputTag("l1tLayer2EG", "L1CtTkEm"),
40-
CL2Taus = cms.InputTag("l1tNNTauProducerPuppi", "L1PFTausNN"),
41-
CL2EtSum = cms.InputTag("l1tMETPFProducer"),
42-
CL2HtSum = cms.InputTag("l1tSC4PFL1PuppiCorrectedEmulatorMHT"),
27+
GTTPromptJets = l1tGTProducer.GTTPromptJets,
28+
GTTDisplacedJets = l1tGTProducer.GTTDisplacedJets,
29+
GTTPromptHtSum = l1tGTProducer.GTTPromptHtSum,
30+
GTTDisplacedHtSum = l1tGTProducer.GTTDisplacedHtSum,
31+
GTTEtSum = l1tGTProducer.GTTEtSum,
32+
GTTPrimaryVert = l1tGTProducer.GTTPrimaryVert,
33+
GMTSaPromptMuons = l1tGTProducer.GMTSaPromptMuons,
34+
GMTSaDisplacedMuons = l1tGTProducer.GMTSaDisplacedMuons,
35+
GMTTkMuons = l1tGTProducer.GMTTkMuons,
36+
CL2JetsSC4 = l1tGTProducer.CL2JetsSC4,
37+
CL2JetsSC8 = l1tGTProducer.CL2JetsSC8,
38+
CL2Electrons = l1tGTProducer.CL2Electrons,
39+
CL2Photons = l1tGTProducer.CL2Photons,
40+
CL2Taus = l1tGTProducer.CL2Taus,
41+
CL2EtSum = l1tGTProducer.CL2EtSum,
42+
CL2HtSum = l1tGTProducer.CL2HtSum,
4343
filename = cms.string("outputObjectPattern"),
4444
maxEvents = cms.uint32(72),
4545
bufferFileType = cms.string("output")

L1Trigger/Phase2L1GT/python/l1tGTMenu_BTagSeeds_cff.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
2121
minEta = cms.double(-1.5),
2222
maxEta = cms.double(1.5),
23-
minQualityScore = cms.uint32(0)
23+
qualityFlags = cms.uint32(0b0001)
2424
),
2525
collection2 = cms.PSet(
2626
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
2727
minEta = cms.double(-1.5),
2828
maxEta = cms.double(1.5),
29-
minQualityScore = cms.uint32(0)
29+
qualityFlags = cms.uint32(0b0001)
3030
),
3131
minDR = cms.double(0),
3232
maxDR =cms.double(1.4),
@@ -43,15 +43,15 @@
4343
maxEta = cms.double(2.4),
4444
regionsAbsEtaLowerBounds=cms.vdouble(0,0.83,1.24),
4545
regionsMinPt=cms.vdouble(4,4,4),
46-
minQualityScore = cms.uint32(0)
46+
qualityFlags = cms.uint32(0b0001)
4747
),
4848
collection2 = cms.PSet(
4949
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
5050
minEta = cms.double(-2.4),
5151
maxEta = cms.double(2.4),
5252
regionsAbsEtaLowerBounds=cms.vdouble(0,0.83,1.24),
5353
regionsMinPt=cms.vdouble(4,4,4),
54-
minQualityScore = cms.uint32(0)
54+
qualityFlags = cms.uint32(0b0001)
5555
),
5656
minDR = cms.double(0),
5757
maxDR =cms.double(1.2),
@@ -68,15 +68,15 @@
6868
maxEta = cms.double(2.0),
6969
regionsAbsEtaLowerBounds=cms.vdouble(0,0.83,1.24),
7070
regionsMinPt=cms.vdouble(4,4,4),
71-
minQualityScore = cms.uint32(0)
71+
qualityFlags = cms.uint32(0b0001)
7272
),
7373
collection2 = cms.PSet(
7474
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
7575
minEta = cms.double(-2.0),
7676
maxEta = cms.double(2.0),
7777
regionsAbsEtaLowerBounds=cms.vdouble(0,0.83,1.24),
7878
regionsMinPt=cms.vdouble(4,4,4),
79-
minQualityScore = cms.uint32(0)
79+
qualityFlags = cms.uint32(0b0001)
8080
),
8181
minDR = cms.double(0),
8282
minInvMass = cms.double(7),
@@ -93,21 +93,21 @@
9393
minPt = cms.double(5),
9494
minEta = cms.double(-2.4),
9595
maxEta = cms.double(2.4),
96-
minQualityScore = cms.uint32(0)
96+
qualityFlags = cms.uint32(0b0001)
9797
),
9898
collection2 = cms.PSet(
9999
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
100100
minPt = cms.double(3),
101101
minEta = cms.double(-2.4),
102102
maxEta = cms.double(2.4),
103-
minQualityScore = cms.uint32(0)
103+
qualityFlags = cms.uint32(0b0001)
104104
),
105105
collection3 = cms.PSet(
106106
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
107107
minPt = cms.double(0),
108108
minEta = cms.double(-2.4),
109109
maxEta = cms.double(2.4),
110-
minQualityScore = cms.uint32(0)
110+
qualityFlags = cms.uint32(0b0001)
111111
),
112112
correl12 = cms.PSet(
113113
minDR = cms.double(0),
@@ -132,21 +132,21 @@
132132
minPt = cms.double(5),
133133
minEta = cms.double(-2.4),
134134
maxEta = cms.double(2.4),
135-
minQualityScore = cms.uint32(0)
135+
qualityFlags = cms.uint32(0b0001)
136136
),
137137
collection2 = cms.PSet(
138138
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
139139
minPt = cms.double(4),
140140
minEta = cms.double(-2.4),
141141
maxEta = cms.double(2.4),
142-
minQualityScore = cms.uint32(0)
142+
qualityFlags = cms.uint32(0b0001)
143143
),
144144
collection3 = cms.PSet(
145145
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
146146
minPt = cms.double(2),
147147
minEta = cms.double(-2.4),
148148
maxEta = cms.double(2.4),
149-
minQualityScore = cms.uint32(0)
149+
qualityFlags = cms.uint32(0b0001)
150150
),
151151
correl12 = cms.PSet(
152152
minDR = cms.double(0),

L1Trigger/Phase2L1GT/python/l1tGTMenu_crossLepSeeds_cff.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
maxEta = cms.double(2.4),
2323
regionsAbsEtaLowerBounds=cms.vdouble(0,0.83,1.24),
2424
regionsMinPt=cms.vdouble(7,7,7),
25-
minQualityScore = cms.uint32(0),
25+
qualityFlags = cms.uint32(0b0001),
2626
),
2727
collection2 = cms.PSet(
2828
tag = cms.InputTag("l1tGTProducer", "CL2Electrons"),
@@ -44,7 +44,7 @@
4444
maxEta = cms.double(2.4),
4545
regionsAbsEtaLowerBounds=cms.vdouble(0,0.83,1.24),
4646
regionsMinPt=cms.vdouble(7,7,7),
47-
minQualityScore = cms.uint32(0),
47+
qualityFlags = cms.uint32(0b0001),
4848
),
4949
collection2 = cms.PSet(
5050
tag = cms.InputTag("l1tGTProducer", "CL2Electrons"),
@@ -87,7 +87,7 @@
8787
maxEta = cms.double(2.4),
8888
regionsAbsEtaLowerBounds=cms.vdouble(0,0.83,1.24),
8989
regionsMinPt=cms.vdouble(6,6,6),
90-
minQualityScore = cms.uint32(0),
90+
qualityFlags = cms.uint32(0b0001),
9191
),
9292
collection2 = cms.PSet(
9393
tag = cms.InputTag("l1tGTProducer", "CL2Electrons"),
@@ -122,15 +122,15 @@
122122
maxEta = cms.double(2.4),
123123
regionsAbsEtaLowerBounds=cms.vdouble(0,0.83,1.24),
124124
regionsMinPt=cms.vdouble(5,5,5),
125-
minQualityScore = cms.uint32(0),
125+
qualityFlags = cms.uint32(0b0001),
126126
),
127127
collection2 = cms.PSet(
128128
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
129129
minEta = cms.double(-2.4),
130130
maxEta = cms.double(2.4),
131131
regionsAbsEtaLowerBounds=cms.vdouble(0,0.83,1.24),
132132
regionsMinPt=cms.vdouble(5,5,5),
133-
minQualityScore = cms.uint32(0),
133+
qualityFlags = cms.uint32(0b0001),
134134
),
135135
collection3 = cms.PSet(
136136
tag = cms.InputTag("l1tGTProducer", "CL2Electrons"),

L1Trigger/Phase2L1GT/python/l1tGTMenu_hadr_crossLepSeeds_cff.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
regionsMinPt=cms.vdouble(6,6,6),
2525
maxPrimVertDz = cms.double(1), # in cm
2626
primVertex = cms.uint32(0), # primary vertex index (choose 0)
27-
minQualityScore = cms.uint32(0)
27+
qualityFlags = cms.uint32(0b0001)
2828
),
2929
collection2 = cms.PSet(
3030
tag = cms.InputTag("l1tGTProducer", "CL2HtSum"),
@@ -44,7 +44,7 @@
4444
regionsMinPt=cms.vdouble(10,10,11),
4545
maxPrimVertDz = cms.double(1), # in cm
4646
primVertex = cms.uint32(0), # primary vertex index (choose 0)
47-
minQualityScore = cms.uint32(0),
47+
qualityFlags = cms.uint32(0b0001),
4848
),
4949
collection2 = cms.PSet(
5050
tag = cms.InputTag("l1tGTProducer", "CL2JetsSC4"),
@@ -89,7 +89,7 @@
8989
regionsMinPt=cms.vdouble(3,3,3),
9090
maxPrimVertDz = cms.double(1), # in cm
9191
primVertex = cms.uint32(0), # primary vertex index (choose 0)
92-
minQualityScore = cms.uint32(0)
92+
qualityFlags = cms.uint32(0b0001)
9393
),
9494
collection2 = cms.PSet(
9595
tag = cms.InputTag("l1tGTProducer", "CL2JetsSC4"),
@@ -118,7 +118,7 @@
118118
regionsMinPt=cms.vdouble(3,3,3),
119119
maxPrimVertDz = cms.double(1), # in cm
120120
primVertex = cms.uint32(0), # primary vertex index (choose 0)
121-
minQualityScore = cms.uint32(0)
121+
qualityFlags = cms.uint32(0b0001)
122122
),
123123
collection2 = cms.PSet(
124124
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
@@ -128,7 +128,7 @@
128128
regionsMinPt=cms.vdouble(3,3,3),
129129
maxPrimVertDz = cms.double(1), # in cm
130130
primVertex = cms.uint32(0), # primary vertex index (choose 0)
131-
minQualityScore = cms.uint32(0)
131+
qualityFlags = cms.uint32(0b0001)
132132
),
133133
collection3 = cms.PSet(
134134
tag = cms.InputTag("l1tGTProducer", "CL2JetsSC4"),
@@ -159,7 +159,7 @@
159159
regionsMinPt=cms.vdouble(3,3,3),
160160
maxPrimVertDz = cms.double(1), # in cm
161161
primVertex = cms.uint32(0), # primary vertex index (choose 0)
162-
minQualityScore = cms.uint32(0)
162+
qualityFlags = cms.uint32(0b0001)
163163
),
164164
collection2 = cms.PSet(
165165
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
@@ -169,7 +169,7 @@
169169
regionsMinPt=cms.vdouble(3,3,3),
170170
maxPrimVertDz = cms.double(1), # in cm
171171
primVertex = cms.uint32(0), # primary vertex index (choose 0)
172-
minQualityScore = cms.uint32(0)
172+
qualityFlags = cms.uint32(0b0001)
173173
),
174174
collection3 = cms.PSet(
175175
tag = cms.InputTag("l1tGTProducer", "CL2HtSum"),

L1Trigger/Phase2L1GT/python/l1tGTMenu_lepSeeds_cff.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
maxEta = cms.double(2.4),
4747
regionsAbsEtaLowerBounds=cms.vdouble(0,0.83,1.24),
4848
regionsMinPt=cms.vdouble(7,7,7),
49-
minQualityScore = cms.uint32(0)
49+
qualityFlags = cms.uint32(0b0001)
5050
),
5151
maxDz = cms.double(1),
5252
minDR = cms.double(0),
@@ -60,21 +60,21 @@
6060
minPt = cms.double(5),
6161
minEta = cms.double(-2.4),
6262
maxEta = cms.double(2.4),
63-
minQualityScore = cms.uint32(0)
63+
qualityFlags = cms.uint32(0b0001)
6464
),
6565
collection2 = cms.PSet(
6666
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
6767
minPt = cms.double(3),
6868
minEta = cms.double(-2.4),
6969
maxEta = cms.double(2.4),
70-
minQualityScore = cms.uint32(0)
70+
qualityFlags = cms.uint32(0b0001)
7171
),
7272
collection3 = cms.PSet(
7373
tag = cms.InputTag("l1tGTProducer", "GMTTkMuons"),
7474
minPt = cms.double(3),
7575
minEta = cms.double(-2.4),
7676
maxEta = cms.double(2.4),
77-
minQualityScore = cms.uint32(0)
77+
qualityFlags = cms.uint32(0b0001)
7878
),
7979
correl12 = cms.PSet(
8080
minDR = cms.double(0),

0 commit comments

Comments
 (0)