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

Modify CaloLayer1 emulator to properly handle saturation in all cases #20000

Merged
merged 4 commits into from Oct 5, 2017

Conversation

nsmith-
Copy link
Contributor

@nsmith- nsmith- commented Aug 1, 2017

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2017

A new Pull Request was created by @nsmith- (Nicholas Smith) for master.

It involves the following packages:

L1Trigger/L1TCaloLayer1

@cmsbuild, @rekovic, @mulhearn can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @kreczko this is something you requested to watch as well.
@davidlange6 you are the release manager for this.

cms-bot commands are listed here

@nsmith-
Copy link
Contributor Author

nsmith- commented Aug 1, 2017

Oh sweet 20000 do I get a prize?

@rekovic
Copy link
Contributor

rekovic commented Aug 1, 2017

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/21974/console Started: 2017/08/01 18:17

@rekovic
Copy link
Contributor

rekovic commented Aug 1, 2017

@nsmith-
hopefully yes.

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2017

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2017

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 1, 2017

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 25
  • DQMHistoTests: Total histograms compared: 2651091
  • DQMHistoTests: Total failures: 31628
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2619282
  • DQMHistoTests: Total skipped: 181
  • DQMHistoTests: Total Missing objects: 0
  • Checked 102 log files, 14 edm output root files, 25 DQM output files

@nsmith-
Copy link
Contributor Author

nsmith- commented Aug 9, 2017

@rekovic can you sign this? (also #20001)

@rekovic
Copy link
Contributor

rekovic commented Aug 14, 2017

+1

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

@@ -18,5 +18,5 @@
unpackEcalMask = cms.bool(False),
unpackHcalMask = cms.bool(False),
# See UCTLayer1.hh for firmware version
firmwareVersion = cms.int32(1),
firmwareVersion = cms.int32(3),
Copy link
Contributor

Choose a reason for hiding this comment

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

hi @nsmith @rekovic - does this change work for all stage 2 data?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes and no, the change will not break the ability to re-emulate using old data, but the bit-level agreement will be broken with old (bugged firmware) data.
So far, there has in general been no requirement that L1T emulation can reproduce historic data at bit-level automatically. (the latest firmware and latest emulator should agree of course)

Copy link
Contributor

Choose a reason for hiding this comment

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

hi @nsmith-interesting- remind me how this code gets used in production workflows?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it is part of the stage2 L1 trigger emulation, not sure what you are asking specifically

if(value > 0xFF) {
value = 0xFF;
if ( fwVersion > 2 ) {
uint32_t absCaloEta = abs(caloEta);
Copy link
Contributor

Choose a reason for hiding this comment

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

please use std::abs

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-20000/998

@cmsbuild
Copy link
Contributor

Pull request #20000 was updated. @cmsbuild, @rekovic, @mulhearn can you please check and sign again.

@nsmith-
Copy link
Contributor Author

nsmith- commented Sep 27, 2017

Well https://github.com/cms-sw/cmssw/releases/CMSSW_9_4_0_pre1 was, but I guess the original base of this PR wasn't 930. Sorry for the noise
edit: guess not, where do these get cut from then? some random point inbetween 930pre?

@rekovic
Copy link
Contributor

rekovic commented Oct 3, 2017

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/23401/console Started: 2017/10/03 16:00

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2017

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2017

Comparison job queued.

@rekovic
Copy link
Contributor

rekovic commented Oct 3, 2017

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2017

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 3, 2017

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 26
  • DQMHistoTests: Total histograms compared: 2761357
  • DQMHistoTests: Total failures: 249
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2760921
  • DQMHistoTests: Total skipped: 187
  • DQMHistoTests: Total Missing objects: 0
  • Checked 107 log files, 10 edm output root files, 26 DQM output files

@davidlange6
Copy link
Contributor

+1

@davidlange6
Copy link
Contributor

as for "Why the heck is 930 not an ancestor of 940" - its because the development for 940 starts before 930 is cut (the break point is when the features of 930 are finalized)

@cmsbuild cmsbuild merged commit 5d51435 into cms-sw:master Oct 5, 2017
@nsmith- nsmith- deleted the layer1ProperSaturation_93x branch April 10, 2018 13:16
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