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

Use named constants for uG(M)T firmware versions etc. #40841

Merged
merged 1 commit into from Feb 23, 2023

Conversation

dinyar
Copy link
Contributor

@dinyar dinyar commented Feb 21, 2023

PR description:

Use named constants for the uG(M)T firmware versions and FED IDs used by the (un)packers. Also fixed an oversight spotted by @elfontan where I had forgotten to correct the uGT firmware version in one spot.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40841/34297

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @dinyar (Dinyar Rabady) for master.

It involves the following packages:

  • L1Trigger/L1TMuon (l1)

@epalencia, @cmsbuild, @cecilecaillol, @aloeliger can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @missirol, @JanFSchulte, @thomreis, @eyigitba 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

@aloeliger
Copy link
Contributor

please test

Comment on lines 62 to 71
static constexpr int ugmtFedId_ = 1402;
static constexpr int ugtFedId_ = 1404;
static constexpr int ugmtFwVersionUntil2016_ = 0x4010000;
static constexpr int ugtFwVersionUntil2016_ = 0x10A6;
static constexpr int ugmtFwVersionUntil2017_ = 0x6000000;
static constexpr int ugtFwVersionUntil2017_ = 0x1120;
static constexpr int ugmtFwVersionRun3Start_ = 0x6000001;
static constexpr int ugtFwVersionUntilRun3Start_ = 0x1130;
static constexpr int ugmtFwVersionFirstWithShowers_ = 0x7000000;
static constexpr int ugtFwVersionFirstWithShowers_ = 0x113B;
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps someone can correct me on this, but I think it is preferred that if you are adding class constants, that they have prefix k in front of them?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi Andrew,

Ah, didn't know that but I'm happy to change it. Should I then do so for the other constants in that file too, I suppose? Also, is it fine to only do it in this PR, but not for the backport?

Cheers,
Dinyar

Copy link
Contributor

Choose a reason for hiding this comment

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

@dinyar It should be fine to keep old constants how they are for now, but I believe that any newly added constants should have prefix k according to http://cms-sw.github.io/cms_coding_rules.html

Copy link
Contributor

Choose a reason for hiding this comment

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

@dinyar And if possible I think it would be good to have the change (same commit if it all possible) in both this and the backport.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @aloeliger,

Ok, done now, let me know if it's ok. I've created a separate commit for the change, but if it also goes in the backport I'd be tempted to squash it (and do the same for the backport). Is that fine?

-d

Copy link
Contributor

Choose a reason for hiding this comment

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

@dinyar I would think it's fine. The alternative is you could just git cherry-pick the same commit to the backport branch of your repository.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, done.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d6be00/30792/summary.html
COMMIT: 4ac1e7a
CMSSW: CMSSW_13_1_X_2023-02-21-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40841/30792/install.sh to create a dev area with all the needed externals and cmssw changes.

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d6be00/30792/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d6be00/30792/git-merge-result

Comparison Summary

Summary:

  • You potentially removed 14 lines from the logs
  • Reco comparison results: 30 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3528709
  • DQMHistoTests: Total failures: 40
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3528647
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 213 log files, 164 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40841/34306

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

Pull request #40841 was updated. @epalencia, @cmsbuild, @cecilecaillol, @aloeliger can you please check and sign again.

@epalencia
Copy link
Contributor

Please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d6be00/30817/summary.html
COMMIT: 7a51b51
CMSSW: CMSSW_13_1_X_2023-02-22-1100/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40841/30817/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially added 6 lines to the logs
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3528709
  • DQMHistoTests: Total failures: 0
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3528687
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 213 log files, 164 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

Also fix overlooked incorrect uGT version from previous commit.
@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40841/34315

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

Pull request #40841 was updated. @epalencia, @cmsbuild, @cecilecaillol, @aloeliger can you please check and sign again.

@aloeliger
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d6be00/30826/summary.html
COMMIT: dd8a1f3
CMSSW: CMSSW_13_1_X_2023-02-22-2300/el8_amd64_gcc11
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/40841/30826/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

There are some workflows for which there are errors in the baseline:
11634.596 step 3
The results for the comparisons for these workflows could be incomplete
This means most likely that the IB is having errors in the relvals.The error does NOT come from this pull request

Summary:

  • You potentially added 5 lines to the logs
  • Reco comparison results: 8 differences found in the comparisons
  • DQMHistoTests: Total files compared: 49
  • DQMHistoTests: Total histograms compared: 3528709
  • DQMHistoTests: Total failures: 3
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3528684
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 213 log files, 164 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@aloeliger
Copy link
Contributor

+l1

@cmsbuild
Copy link
Contributor

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)

@rappoccio
Copy link
Contributor

+1

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

5 participants