Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[HGCal trigger] Remove deprecated v8 geometry code + Add new trigger geometry class #34608

Merged
merged 5 commits into from Aug 8, 2021

Conversation

jbsauvan
Copy link
Contributor

PR description:

  • Remove deprecated code used for the HGCAL V8 geometry (related to issue Deprecate code support for HGCal v8 #27095 )
  • Add a new trigger geometry class HGCalTriggerGeometryV9Imp3 containing information on the connections between modules, lpGBT links and backend FPGAs, read from a json file.
    Currently not used by default, but will replace HGCalTriggerGeometryV9Imp2 in the future.

Associated internal PRs and reviews:

This PR depends on external cms-data/L1Trigger-L1THGCal#22

PR validation:

Private tests in L1Trigger/L1THGCalUtilities/test:

cmsRun testHGCalL1T_RelValV11_cfg.py
cmsRun testHGCalL1T_multialgo_V11_cfg.py

Tested D49, D60 and D68 workflows

runTheMatrix.py -w upgrade -l 23234.0 --maxSteps=2 
runTheMatrix.py -w upgrade -l 28234.0 --maxSteps=2 
runTheMatrix.py -w upgrade -l 31434.0 --maxSteps=2

@snwebb FYI

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34608/24174

  • This PR adds an extra 216KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • DataFormats/ForwardDetId (upgrade, simulation)
  • DataFormats/L1THGCal (upgrade, l1)
  • L1Trigger/L1THGCal (upgrade, l1)
  • L1Trigger/L1THGCalUtilities (upgrade, l1)

@civanch, @mdhildreth, @cmsbuild, @rekovic, @srimanob, @kpedro88, @cecilecaillol can you please review it and eventually sign? Thanks.
@apsallid, @rovere, @lgray, @Martin-Grunewald, @bsunanda, @amarini, @fabiocos this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy, @perrotta you are the release manager for this.

cms-bot commands are listed here

@perrotta
Copy link
Contributor

test parameters:

@cecilecaillol
Copy link
Contributor

please test with cms-data/L1Trigger-L1THGCal#22

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-1a3835/17194/summary.html
COMMIT: 6c52b5b
CMSSW: CMSSW_12_0_X_2021-07-25-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34608/17194/install.sh to create a dev area with all the needed externals and cmssw changes.

CMS StaticAnalyzer warnings: There are 4 EventSetupRecord::get warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-1a3835/17194/llvm-analysis/esrget-sa.txt for details.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 39
  • DQMHistoTests: Total histograms compared: 2998564
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2998535
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 38 files compared)
  • Checked 165 log files, 37 edm output root files, 39 DQM output files
  • TriggerResults: no differences found

@civanch
Copy link
Contributor

civanch commented Jul 27, 2021

+1

@cecilecaillol
Copy link
Contributor

+l1

totalLayers_ = eeLayers_ + fhLayers_ + bhLayers_;
}
bhLayers_ = geom_->hscTopology().dddConstants().layers(true);
totalLayers_ = eeLayers_ + fhLayers_;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the definition of totalLayers_ changed here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The definition of totalLayers_ as totalLayers_ = eeLayers_ + fhLayers_ + bhLayers_ was only for geometries <=V8, where the HCAL layers were divided into front and back sections. In geometries >= V9, the silicon section of HCAL is covering all the HCAL layers (given by fhLayers_).
Before there was a switch to check whether the geometry was <=V8 or >=V9; now the switch has been removed. So the definition of totalLayers_ for geometries >=V9 has not changed.

@srimanob
Copy link
Contributor

srimanob commented Aug 1, 2021

Just wonder, in addition of the PR, do you still want to keep FIXME of HFNose in the following line,

@jbsauvan
Copy link
Contributor Author

jbsauvan commented Aug 3, 2021

Just wonder, in addition of the PR, do you still want to keep FIXME of HFNose in the following line,

The method HGCalTriggerTools::layers(ForwardSubdetector type) is actually used for HFNose. The function using DetId::Detector type can't easily handle HFNose I think, I'll have to think about what to do there.

@srimanob
Copy link
Contributor

srimanob commented Aug 6, 2021

+Upgrade

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 6, 2021

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @silviodonato, @dpiparo, @qliphy, @perrotta (and backports should be raised in the release meeting by the corresponding L2)

@qliphy
Copy link
Contributor

qliphy commented Aug 8, 2021

+1

@cmsbuild cmsbuild merged commit d436a32 into cms-sw:master Aug 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants