Skip to content

Commit d8f5228

Browse files
authored
Merge pull request #47204 from artlbv/fixP2GT_etaregions
L1 P2GT region cut checks and fixing menu config
2 parents a287591 + 7e19b53 commit d8f5228

File tree

4 files changed

+28
-12
lines changed

4 files changed

+28
-12
lines changed

L1Trigger/Configuration/python/Phase2GTMenus/SeedDefinitions/step1_2024/l1tGTMenu_hadr_crossLepSeeds_cff.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
primVertex = cms.uint32(0), # primary vertex index (choose 0)
4040
),
4141
collection2 = l1tGTsc4Jet.clone(
42-
regionsMinPt=cms.vdouble(25,25), #safety cut
42+
minPt = cms.double(25) #safety cut
4343
),
4444
collection3 = l1tGTsc4Jet.clone(
45-
regionsMinPt=cms.vdouble(25,25), #safety cut
45+
minPt = cms.double(25) #safety cut
4646
),
4747
collection4 = l1tGTsc4Jet.clone(
48-
regionsMinPt=cms.vdouble(25,25), #safety cut
48+
minPt = cms.double(25) #safety cut
4949
),
5050
correl12 = cms.PSet(
5151
maxDR = cms.double(0.4),
@@ -169,7 +169,7 @@
169169
primVertex = cms.uint32(0), # primary vertex index (choose 0)
170170
),
171171
collection2 = l1tGTsc4Jet.clone(
172-
regionsMinPt=cms.vdouble(25,25), #safety cut
172+
minPt = cms.double(25) #safety cut
173173
),
174174
minDR = cms.double(0.3)
175175
)

L1Trigger/Configuration/python/Phase2GTMenus/SeedDefinitions/step1_2024_explicitSeeds/l1tGTMenu_hadr_crossLepSeeds_cff.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@
5353
minEta = cms.double(-2.4),
5454
maxEta = cms.double(2.4),
5555
regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
56-
regionsMinPt=cms.vdouble(25,25), #safety cut
56+
minPt = cms.double(25) #safety cut
5757
),
5858
collection3 = cms.PSet(
5959
tag = cms.InputTag("l1tGTProducer", "CL2JetsSC4"),
6060
minEta = cms.double(-2.4),
6161
maxEta = cms.double(2.4),
6262
regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
63-
regionsMinPt=cms.vdouble(25,25), #safety cut
63+
minPt = cms.double(25) #safety cut
6464
),
6565
collection4 = cms.PSet(
6666
tag = cms.InputTag("l1tGTProducer", "CL2JetsSC4"),
6767
minEta = cms.double(-2.4),
6868
maxEta = cms.double(2.4),
6969
regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
70-
regionsMinPt=cms.vdouble(25,25), #safety cut
70+
minPt = cms.double(25) #safety cut
7171
),
7272
correl12 = cms.PSet(
7373
maxDR = cms.double(0.4),
@@ -247,7 +247,7 @@
247247
minEta = cms.double(-2.4),
248248
maxEta = cms.double(2.4),
249249
regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
250-
regionsMinPt=cms.vdouble(25,25), #safety cut
250+
minPt = cms.double(25) #safety cut
251251
),
252252
minDR = cms.double(0.3)
253253
)
@@ -262,7 +262,7 @@
262262
tag = cms.InputTag("l1tGTProducer", "CL2Taus"),
263263
minEta = cms.double(-2.172),
264264
maxEta = cms.double(2.172),
265-
regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
265+
regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2Taus"),
266266
regionsMinPt = get_object_thrs(55, "CL2Taus","default"),
267267
minQualityScore = get_object_ids("CL2Taus","default")
268268
),

L1Trigger/Configuration/python/Phase2GTMenus/SeedDefinitions/step1_2024_explicitSeeds/l1tGTMenu_lepSeeds_cff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,15 @@
241241
tag = cms.InputTag("l1tGTProducer", "CL2Taus"),
242242
minEta = cms.double(-2.172),
243243
maxEta = cms.double(2.172),
244-
regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
244+
regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2Taus"),
245245
regionsMinPt = get_object_thrs(52, "CL2Taus","default"),
246246
minQualityScore = get_object_ids("CL2Taus","default")
247247
),
248248
collection2 = cms.PSet(
249249
tag = cms.InputTag("l1tGTProducer", "CL2Taus"),
250250
minEta = cms.double(-2.172),
251251
maxEta = cms.double(2.172),
252-
regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
252+
regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2Taus"),
253253
regionsMinPt = get_object_thrs(52, "CL2Taus","default"),
254254
minQualityScore = get_object_ids("CL2Taus","default")
255255
),

L1Trigger/Phase2L1GT/plugins/L1GTSingleCollectionCut.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,23 @@ namespace l1t {
9090
primVertex_(getOptionalParam<unsigned int>("primVertex", config)),
9191
minPtMultiplicityN_(config.getParameter<unsigned int>("minPtMultiplicityN")),
9292
minPtMultiplicityCut_(getOptionalParam<int, double>(
93-
"minPtMultiplicityCut", config, [&scales](double value) { return scales.to_hw_pT_floor(value); })) {}
93+
"minPtMultiplicityCut", config, [&scales](double value) { return scales.to_hw_pT_floor(value); })) {
94+
if (!regionsMinPt_.empty() && regionsAbsEtaLowerBounds_.size() != regionsMinPt_.size()) {
95+
throw cms::Exception("Configuration")
96+
<< "\'regionsMinPt\' has " << regionsMinPt_.size() << " entries, but requires "
97+
<< regionsAbsEtaLowerBounds_.size() << " in " << tag_ << " .";
98+
}
99+
if (!regionsMaxRelIsolationPt_.empty() && regionsAbsEtaLowerBounds_.size() != regionsMaxRelIsolationPt_.size()) {
100+
throw cms::Exception("Configuration")
101+
<< "\'regionsMaxRelIsolationPt\' has " << regionsMaxRelIsolationPt_.size() << " entries, but requires "
102+
<< regionsAbsEtaLowerBounds_.size() << " in " << tag_ << " .";
103+
}
104+
if (!regionsQualityFlags_.empty() && regionsAbsEtaLowerBounds_.size() != regionsQualityFlags_.size()) {
105+
throw cms::Exception("Configuration")
106+
<< "\'regionsQualityFlags\' has " << regionsQualityFlags_.size() << " entries, but requires "
107+
<< regionsAbsEtaLowerBounds_.size() << " in " << tag_ << " .";
108+
}
109+
}
94110

95111
bool checkObject(const P2GTCandidate& obj) const {
96112
bool result = true;

0 commit comments

Comments
 (0)