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

include MAXFEDID in FED-ID loops #40406

Merged
merged 1 commit into from Jan 6, 2023
Merged

Conversation

missirol
Copy link
Contributor

PR description:

This PR fixes cases where loops over FED IDs are done only up to FEDNumbering::MAXFEDID - 1, rather than up to FEDNumbering::MAXFEDID.

FEDNumbering::MAXFEDID corresponds to 4096, and it is a valid FED ID:

MAXFEDID = 4096, // must be larger than largest used FED id

static constexpr int lastFEDId() { return MAXFEDID; }

FEDRawDataCollection::FEDRawDataCollection() : data_(FEDNumbering::lastFEDId() + 1) {}

As far as I know, this FED ID is not actually used at the moment (no data), so this fix likely has no visible consequences.

PR validation:

None.

If this PR is a backport, please specify the original PR and why you need to backport that PR. If this PR will be backported, please specify to which release cycle the backport is meant for:

N/A

int i = 0;
for (i = 0; i < FEDNumbering::lastFEDId(); i++)
for (i = 0; i <= FEDNumbering::MAXFEDID; i++) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

FEDNumbering::lastFEDId() is equal to FEDNumbering::MAXFEDID:

static constexpr int lastFEDId() { return MAXFEDID; }

@@ -48,7 +48,7 @@ void Phase2Tracker::Phase2TrackerCommissioningDigiProducer::produce(edm::StreamI

// Analyze strip tracker FED buffers in data
size_t fedIndex;
for (fedIndex = 0; fedIndex < Phase2Tracker::CMS_FED_ID_MAX; ++fedIndex) {
for (fedIndex = 0; fedIndex <= Phase2Tracker::CMS_FED_ID_MAX; ++fedIndex) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Phase2Tracker::CMS_FED_ID_MAX is equal to FEDNumbering::MAXFEDID:

static const uint16_t CMS_FED_ID_MAX = static_cast<uint16_t>(FEDNumbering::MAXFEDID);

@missirol
Copy link
Contributor Author

type bugfix

@missirol
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40406/33534

  • This PR adds an extra 32KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @missirol (Marino Missiroli) for master.

It involves the following packages:

  • Calibration/HcalAlCaRecoProducers (alca)
  • Calibration/HcalIsolatedTrackReco (alca)
  • DataFormats/FEDRawData (daq)
  • EventFilter/HcalRawToDigi (reconstruction)
  • EventFilter/Phase2TrackerRawToDigi (daq, reconstruction)
  • EventFilter/RawDataCollector (daq)

@malbouis, @yuanchao, @ChrisMisan, @emeschi, @clacaputo, @saumyaphor4252, @tvami, @mandrenguyen, @smorovic, @francescobrivio can you please review it and eventually sign? Thanks.
@rovere, @Martin-Grunewald, @bsunanda, @tocheng, @mmusich, @abdoulline this is something you requested to watch as well.
@perrotta, @dpiparo, @rappoccio you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d9f29e/29768/summary.html
COMMIT: 4f84482
CMSSW: CMSSW_13_0_X_2022-12-26-2300/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40406/29768/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 15 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3555748
  • DQMHistoTests: Total failures: 12
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3555714
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 211 log files, 162 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@tvami
Copy link
Contributor

tvami commented Dec 27, 2022

+alca

  • diffs in MsgLogger only

@smorovic
Copy link
Contributor

+daq

@clacaputo
Copy link
Contributor

+reconstruction

@cmsbuild
Copy link
Contributor

cmsbuild commented Jan 6, 2023

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. @perrotta, @dpiparo, @rappoccio (and backports should be raised in the release meeting by the corresponding L2)

@perrotta
Copy link
Contributor

perrotta commented Jan 6, 2023

+1

@cmsbuild cmsbuild merged commit a22313c into cms-sw:master Jan 6, 2023
@missirol missirol deleted the devel_MAXFEDID branch January 7, 2023 10:53
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

6 participants