Merge pull request #47204 from artlbv/fixP2GT_etaregions

L1 P2GT region cut checks and fixing menu config
cms-sw · Feb 5, 2025 · d8f5228 · d8f5228
2 parents a287591 + 7e19b53
commit d8f5228
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/...ation/python/Phase2GTMenus/SeedDefinitions/step1_2024/l1tGTMenu_hadr_crossLepSeeds_cff.py b/...ation/python/Phase2GTMenus/SeedDefinitions/step1_2024/l1tGTMenu_hadr_crossLepSeeds_cff.py
@@ -39,13 +39,13 @@
         primVertex = cms.uint32(0), # primary vertex index (choose 0)
     ),
     collection2 = l1tGTsc4Jet.clone(
-        regionsMinPt=cms.vdouble(25,25), #safety cut
+        minPt = cms.double(25) #safety cut
     ),
     collection3 = l1tGTsc4Jet.clone(
-        regionsMinPt=cms.vdouble(25,25), #safety cut
+        minPt = cms.double(25) #safety cut
     ),
     collection4 = l1tGTsc4Jet.clone(
-        regionsMinPt=cms.vdouble(25,25), #safety cut
+        minPt = cms.double(25) #safety cut
     ),
     correl12 = cms.PSet(
         maxDR = cms.double(0.4),
@@ -169,7 +169,7 @@
         primVertex = cms.uint32(0), # primary vertex index (choose 0)
     ),
     collection2 = l1tGTsc4Jet.clone(
-        regionsMinPt=cms.vdouble(25,25), #safety cut
+        minPt = cms.double(25) #safety cut
     ),
     minDR = cms.double(0.3)
 )

diff --git a/...hase2GTMenus/SeedDefinitions/step1_2024_explicitSeeds/l1tGTMenu_hadr_crossLepSeeds_cff.py b/...hase2GTMenus/SeedDefinitions/step1_2024_explicitSeeds/l1tGTMenu_hadr_crossLepSeeds_cff.py
@@ -53,21 +53,21 @@
         minEta = cms.double(-2.4),
         maxEta = cms.double(2.4),
         regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
-        regionsMinPt=cms.vdouble(25,25), #safety cut
+        minPt = cms.double(25) #safety cut
     ),
     collection3 = cms.PSet(
         tag = cms.InputTag("l1tGTProducer", "CL2JetsSC4"),
         minEta = cms.double(-2.4),
         maxEta = cms.double(2.4),
         regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
-        regionsMinPt=cms.vdouble(25,25), #safety cut
+        minPt = cms.double(25) #safety cut
     ),
     collection4 = cms.PSet(
         tag = cms.InputTag("l1tGTProducer", "CL2JetsSC4"),
         minEta = cms.double(-2.4),
         maxEta = cms.double(2.4),
         regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
-        regionsMinPt=cms.vdouble(25,25), #safety cut
+        minPt = cms.double(25) #safety cut
     ),
     correl12 = cms.PSet(
         maxDR = cms.double(0.4),
@@ -247,7 +247,7 @@
         minEta = cms.double(-2.4),
         maxEta = cms.double(2.4),
         regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
-        regionsMinPt=cms.vdouble(25,25), #safety cut
+        minPt = cms.double(25) #safety cut
     ),
     minDR = cms.double(0.3)
 )
@@ -262,7 +262,7 @@
         tag = cms.InputTag("l1tGTProducer", "CL2Taus"),
         minEta = cms.double(-2.172),
         maxEta = cms.double(2.172),
-        regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
+        regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2Taus"),
         regionsMinPt = get_object_thrs(55, "CL2Taus","default"),
         minQualityScore = get_object_ids("CL2Taus","default")
     ),

diff --git a/...n/python/Phase2GTMenus/SeedDefinitions/step1_2024_explicitSeeds/l1tGTMenu_lepSeeds_cff.py b/...n/python/Phase2GTMenus/SeedDefinitions/step1_2024_explicitSeeds/l1tGTMenu_lepSeeds_cff.py
@@ -241,15 +241,15 @@
         tag = cms.InputTag("l1tGTProducer", "CL2Taus"),
         minEta = cms.double(-2.172),
         maxEta = cms.double(2.172),
-        regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
+        regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2Taus"),
         regionsMinPt = get_object_thrs(52, "CL2Taus","default"),
         minQualityScore = get_object_ids("CL2Taus","default")
     ),
     collection2 = cms.PSet(
         tag = cms.InputTag("l1tGTProducer", "CL2Taus"),
         minEta = cms.double(-2.172),
         maxEta = cms.double(2.172),
-        regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2JetsSC4"),
+        regionsAbsEtaLowerBounds = get_object_etalowbounds("CL2Taus"),
         regionsMinPt = get_object_thrs(52, "CL2Taus","default"),
         minQualityScore = get_object_ids("CL2Taus","default")
     ),

diff --git a/L1Trigger/Phase2L1GT/plugins/L1GTSingleCollectionCut.h b/L1Trigger/Phase2L1GT/plugins/L1GTSingleCollectionCut.h
@@ -90,7 +90,23 @@ namespace l1t {
           primVertex_(getOptionalParam<unsigned int>("primVertex", config)),
           minPtMultiplicityN_(config.getParameter<unsigned int>("minPtMultiplicityN")),
           minPtMultiplicityCut_(getOptionalParam<int, double>(
-              "minPtMultiplicityCut", config, [&scales](double value) { return scales.to_hw_pT_floor(value); })) {}
+              "minPtMultiplicityCut", config, [&scales](double value) { return scales.to_hw_pT_floor(value); })) {
+      if (!regionsMinPt_.empty() && regionsAbsEtaLowerBounds_.size() != regionsMinPt_.size()) {
+        throw cms::Exception("Configuration")
+            << "\'regionsMinPt\' has " << regionsMinPt_.size() << " entries, but requires "
+            << regionsAbsEtaLowerBounds_.size() << " in " << tag_ << " .";
+      }
+      if (!regionsMaxRelIsolationPt_.empty() && regionsAbsEtaLowerBounds_.size() != regionsMaxRelIsolationPt_.size()) {
+        throw cms::Exception("Configuration")
+            << "\'regionsMaxRelIsolationPt\' has " << regionsMaxRelIsolationPt_.size() << " entries, but requires "
+            << regionsAbsEtaLowerBounds_.size() << " in " << tag_ << " .";
+      }
+      if (!regionsQualityFlags_.empty() && regionsAbsEtaLowerBounds_.size() != regionsQualityFlags_.size()) {
+        throw cms::Exception("Configuration")
+            << "\'regionsQualityFlags\' has " << regionsQualityFlags_.size() << " entries, but requires "
+            << regionsAbsEtaLowerBounds_.size() << " in " << tag_ << " .";
+      }
+    }
 
     bool checkObject(const P2GTCandidate& obj) const {
       bool result = true;