[HGCAL trigger] Updated trigger towers (+minor updates) #30883

jbsauvan · 2020-07-23T12:59:56Z

PR description:

The main update is a more realistic implementation of trigger towers based on module sums instead of trigger cells (@echapon).
This PR also includes minor changes: a change in the digis samples filling format in the analysis ntuples (@dnoonan08), and a fix in the config of the Best Choice selection algorithm (which is not used by default).

PR validation:

Workflows tested: 23234.0, 27034.0, 28234.0

cmsbuild · 2020-07-23T13:00:18Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-07-23T13:05:36Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30883/17263

This PR adds an extra 36KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File L1Trigger/L1THGCal/src/backend/HGCalHistoClusteringImpl.cc modified in PR(s): [Clang tidy] Apply checks for l1-upgrade #30803
- File L1Trigger/L1THGCal/src/backend/HGCalTowerMap2DImpl.cc modified in PR(s): [Clang tidy] Apply checks for l1-upgrade #30803

Code check has found code style and quality issues which could be resolved by applying following patch(s)

code-format:
https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30883/17263/code-format.patch
e.g. curl https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30883/17263/code-format.patch | patch -p1
You can also run scram build code-format to apply code format directly

cmsbuild · 2020-07-23T13:13:04Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-07-23T13:17:36Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30883/17264

This PR adds an extra 36KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File L1Trigger/L1THGCal/src/backend/HGCalHistoClusteringImpl.cc modified in PR(s): [Clang tidy] Apply checks for l1-upgrade #30803
- File L1Trigger/L1THGCal/src/backend/HGCalTowerMap2DImpl.cc modified in PR(s): [Clang tidy] Apply checks for l1-upgrade #30803

cmsbuild · 2020-07-23T13:17:54Z

A new Pull Request was created by @jbsauvan (Jean-Baptiste Sauvan) for master.

It involves the following packages:

L1Trigger/L1THGCal
L1Trigger/L1THGCalUtilities

@cmsbuild, @rekovic, @benkrikler, @kpedro88 can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @amarini, @lgray this is something you requested to watch as well.
@silviodonato, @dpiparo you are the release manager for this.

cms-bot commands are listed here

kpedro88 · 2020-07-23T14:14:10Z

L1Trigger/L1THGCal/interface/backend/HGCalTowerMap2DImpl.h

+  void buildTowerMap2D(const std::vector<edm::Ptr<T>>& ptrs, l1t::HGCalTowerMapBxCollection& towerMaps) {
+    std::unordered_map<int, l1t::HGCalTowerMap> towerMapsTmp = newTowerMaps();
+
+    for (auto ptr : ptrs) {


better as const auto& ptr

kpedro88 · 2020-07-23T14:15:16Z

L1Trigger/L1THGCal/interface/backend/HGCalTowerMap2DImpl.h

+      towerMapsTmp[layer].addEt(towerGeometryHelper_.getTriggerTower(*ptr), etEm, etHad);
+    }
+
+    /* store towerMaps in the persistent collection */


why is the towerMapsTmp needed at all? can't this algorithm just fill towerMaps directly?

We have one tower map per trigger layer, so not every layer. It was easier to fill in a map rather than in a vector of tower maps.

kpedro88 · 2020-07-23T14:18:27Z

L1Trigger/L1THGCal/plugins/backend/HGCalTowerProcessor.cc

+    std::vector<edm::Ptr<l1t::HGCalTriggerCell>> trigCellVec;
+    for (unsigned i = 0; i < unclTCsCollHandle->size(); ++i) {
+      edm::Ptr<l1t::HGCalCluster> ptr(unclTCsCollHandle, i);
+      for (auto itTC : ptr->constituents()) {


const auto&

kpedro88 · 2020-07-23T14:19:49Z

L1Trigger/L1THGCal/src/backend/HGCalHistoClusteringImpl.cc

 }

 void HGCalHistoClusteringImpl::finalizeClusters(std::vector<l1t::HGCalMulticluster>& multiclusters_in,
+                                                std::vector<l1t::HGCalCluster>& rejected_clusters_in,


kpedro88 · 2020-07-23T14:19:55Z

L1Trigger/L1THGCal/src/backend/HGCalHistoClusteringImpl.cc

                                                const HGCalTriggerGeometryBase& triggerGeometry) const {
+  for (auto& tc : rejected_clusters_in) {


const auto&

kpedro88 · 2020-07-23T14:20:08Z

L1Trigger/L1THGCal/src/backend/HGCalHistoClusteringImpl.cc

@@ -133,6 +145,10 @@ void HGCalHistoClusteringImpl::finalizeClusters(std::vector<l1t::HGCalMulticlust
      multicluster.saveHOverE();

      multiclusters_out.push_back(0, multicluster);
+    } else {
+      for (auto& tc : multicluster.constituents()) {


const auto&

kpedro88 · 2020-07-23T14:21:00Z

L1Trigger/L1THGCalUtilities/plugins/ntuples/HGCalTriggerNtupleHGCDigis.cc

@@ -75,6 +78,17 @@ DEFINE_EDM_PLUGIN(HGCalTriggerNtupleFactory, HGCalTriggerNtupleHGCDigis, "HGCalT

 HGCalTriggerNtupleHGCDigis::HGCalTriggerNtupleHGCDigis(const edm::ParameterSet& conf) : HGCalTriggerNtupleBase(conf) {
  is_Simhit_comp_ = conf.getParameter<bool>("isSimhitComp");
+  digiBXselect_ = conf.getParameter<std::vector<unsigned int>>("digiBXselect");
+
+  if (*std::max_element(digiBXselect_.begin(), digiBXselect_.end()) >= kDigiSize_) {


for safety, check if the vector is non-empty first

kpedro88 · 2020-07-23T14:21:54Z

L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py

@@ -50,7 +50,8 @@
    eeSimHits = cms.InputTag('g4SimHits:HGCHitsEE'),
    fhSimHits = cms.InputTag('g4SimHits:HGCHitsHEfront'),
    bhSimHits = cms.InputTag('g4SimHits:HcalHits'),
-    isSimhitComp = cms.bool(False)
+    isSimhitComp = cms.bool(False),
+    digiBXselect = cms.vuint32([2])


can just be cms.vuint32(2)

kpedro88 · 2020-07-23T14:22:24Z

please test

cmsbuild · 2020-07-23T14:22:50Z

The tests are being triggered in jenkins.

CMSSW_11_2_X_2020-07-22-2300/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/8248/console Started: 2020/07/23 16:23

cmsbuild · 2020-07-23T15:45:57Z

+1
Tested at: a7fa581
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fce48e/8248/summary.html
CMSSW: CMSSW_11_2_X_2020-07-22-2300
SCRAM_ARCH: slc7_amd64_gcc820

cmsbuild · 2020-07-23T15:46:01Z

Comparison job queued.

cmsbuild · 2020-07-29T08:25:22Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-07-29T08:31:18Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-30883/17388

This PR adds an extra 36KB to repository

cmsbuild · 2020-07-29T08:31:41Z

Pull request #30883 was updated. @cmsbuild, @rekovic, @benkrikler, @kpedro88 can you please check and sign again.

kpedro88 · 2020-07-29T13:05:59Z

please test

cmsbuild · 2020-07-29T13:06:21Z

The tests are being triggered in jenkins.

CMSSW_11_2_X_2020-07-28-2300/slc7_amd64_gcc820: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/8394/console Started: 2020/07/29 15:14

cmsbuild · 2020-07-29T14:26:49Z

+1
Tested at: babb254
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fce48e/8394/summary.html
CMSSW: CMSSW_11_2_X_2020-07-28-2300
SCRAM_ARCH: slc7_amd64_gcc820

cmsbuild · 2020-07-29T14:26:51Z

Comparison job queued.

cmsbuild · 2020-07-29T15:51:16Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fce48e/8394/summary.html

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 4 differences found in the comparisons
DQMHistoTests: Total files compared: 34
DQMHistoTests: Total histograms compared: 2525444
DQMHistoTests: Total failures: 7
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2525390
DQMHistoTests: Total skipped: 47
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
Checked 144 log files, 17 edm output root files, 34 DQM output files

kpedro88 · 2020-07-31T00:05:03Z

+upgrade

silviodonato · 2020-08-05T09:14:44Z

Kind reminder @cms-sw/l1-l2

silviodonato · 2020-08-07T08:44:18Z

merge

cmsbuild added this to the CMSSW_11_2_X milestone Jul 23, 2020

cmsbuild added code-checks-pending comparison-pending l1-pending orp-pending pending-signatures tests-pending upgrade-pending labels Jul 23, 2020

jbsauvan mentioned this pull request Jul 23, 2020

List of integrations PFCal-dev/cmssw#44

Open

cmsbuild added code-checks-rejected and removed code-checks-pending labels Jul 23, 2020

jbsauvan force-pushed the hgc-tpg-integration-200722 branch from 35b8a30 to a7fa581 Compare July 23, 2020 13:12

cmsbuild added code-checks-pending and removed code-checks-rejected labels Jul 23, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Jul 23, 2020

kpedro88 reviewed Jul 23, 2020

View reviewed changes

cmsbuild added tests-started and removed tests-pending labels Jul 23, 2020

cmsbuild added tests-approved and removed tests-started labels Jul 23, 2020

cmsbuild added pending-signatures tests-pending upgrade-pending labels Jul 29, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Jul 29, 2020

cmsbuild mentioned this pull request Jul 29, 2020

BS online for 11 2 x #30591

Closed

cmsbuild added tests-started and removed tests-pending labels Jul 29, 2020

cmsbuild added tests-approved and removed tests-started labels Jul 29, 2020

cmsbuild added comparison-available and removed comparison-pending labels Jul 29, 2020

cmsbuild mentioned this pull request Jul 30, 2020

Add Phase 2 Trackers T21 + T22 + T23 (Mechanical Update in Outer Tracker + Sensors studies in Inner Tracker) #30927

Closed

cmsbuild added upgrade-approved and removed upgrade-pending labels Jul 31, 2020

cmsbuild added orp-approved and removed orp-pending labels Aug 7, 2020

cmsbuild merged commit 0a1af44 into cms-sw:master Aug 7, 2020

jbsauvan mentioned this pull request Nov 29, 2021

Archived Integrations hgc-tpg/cmssw#1

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[HGCAL trigger] Updated trigger towers (+minor updates) #30883

[HGCAL trigger] Updated trigger towers (+minor updates) #30883

jbsauvan commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

kpedro88 Jul 23, 2020

kpedro88 Jul 23, 2020

jbsauvan Jul 24, 2020

kpedro88 Jul 23, 2020

kpedro88 Jul 23, 2020

kpedro88 Jul 23, 2020

kpedro88 Jul 23, 2020

kpedro88 Jul 23, 2020

kpedro88 Jul 23, 2020

kpedro88 commented Jul 23, 2020

cmsbuild commented Jul 23, 2020 •

edited

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 29, 2020

cmsbuild commented Jul 29, 2020

cmsbuild commented Jul 29, 2020

kpedro88 commented Jul 29, 2020

cmsbuild commented Jul 29, 2020 •

edited

cmsbuild commented Jul 29, 2020

cmsbuild commented Jul 29, 2020

cmsbuild commented Jul 29, 2020

kpedro88 commented Jul 31, 2020

silviodonato commented Aug 5, 2020

silviodonato commented Aug 7, 2020

		const HGCalTriggerGeometryBase& triggerGeometry) const {
		for (auto& tc : rejected_clusters_in) {

[HGCAL trigger] Updated trigger towers (+minor updates) #30883

[HGCAL trigger] Updated trigger towers (+minor updates) #30883

Conversation

jbsauvan commented Jul 23, 2020

PR description:

PR validation:

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kpedro88 commented Jul 23, 2020

cmsbuild commented Jul 23, 2020 • edited

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 23, 2020

cmsbuild commented Jul 29, 2020

cmsbuild commented Jul 29, 2020

cmsbuild commented Jul 29, 2020

kpedro88 commented Jul 29, 2020

cmsbuild commented Jul 29, 2020 • edited

cmsbuild commented Jul 29, 2020

cmsbuild commented Jul 29, 2020

cmsbuild commented Jul 29, 2020

kpedro88 commented Jul 31, 2020

silviodonato commented Aug 5, 2020

silviodonato commented Aug 7, 2020

cmsbuild commented Jul 23, 2020 •

edited

cmsbuild commented Jul 29, 2020 •

edited