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

GEM - fed data size bugfix [EventFilter/GEMRawToDigi] #31776

Merged
merged 3 commits into from
Oct 14, 2020

Conversation

jshlee
Copy link
Contributor

@jshlee jshlee commented Oct 13, 2020

PR description:

  • error in how FED trailer fragmentLength was stored

PR validation:

  • only changes 1 number in FED data that isn't used

if this PR is a backport please specify the original PR and why you need to backport that PR:

  • no backport needed

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31776/19026

  • This PR adds an extra 20KB to repository

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

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31776/19027

  • This PR adds an extra 20KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @jshlee (Jason Lee) for master.

It involves the following packages:

EventFilter/GEMRawToDigi

@perrotta, @jpata, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @watson-ij this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@@ -266,9 +268,12 @@ void GEMDigiToRawModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
fedRawData.resize(dataSize);

uint64_t* w = reinterpret_cast<uint64_t*>(fedRawData.data());
for (const auto& word : words)
for (const auto& word : words) {
#ifdef EDM_ML_DEBUG
Copy link
Contributor

@perrotta perrotta Oct 14, 2020

Choose a reason for hiding this comment

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

It is curious that you use both LogDebug and #ifdef EDM_ML_DEBUG in the same class: was any of them a remnant of your validation of the fix, or are they supposed to remain both?
In any case, a

#include "FWCore/MessageLogger/interface/MessageLogger.h"

statement is missing from both plugins

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@perrotta Only LogDebug was used originally. I added a few more LogDebug and used EDM_ML_DEBUG for the output to be easier to see. I can change them all to either one if that is preferred.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think that having one single method to report debug logs can be less confusing, and the one stated in the MessageLogger are typically recommendedin CMSSW instead of cout's (which aren't thread safe, in case you want to use them in a multithread environment). I won't be strict on it, though, and I just wanted to point it out to you.
In any case, if you stick on LogDebug, please add the missing header includes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31776/19038

  • This PR adds an extra 20KB to repository

@perrotta
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 14, 2020

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

Pull request #31776 was updated. @perrotta, @jpata, @cmsbuild, @slava77 can you please check and sign again.

@cmsbuild
Copy link
Contributor

+1
Tested at: d2467cd
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-96d424/9933/summary.html
CMSSW: CMSSW_11_2_X_2020-10-13-2300
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 35
  • DQMHistoTests: Total histograms compared: 2543752
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2543723
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
  • Checked 149 log files, 22 edm output root files, 35 DQM output files

@perrotta
Copy link
Contributor

+1

  • Simple and logical fix
  • Jenkins tests pass

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

@silviodonato
Copy link
Contributor

+1
if I understand correctly, this should affect both Run-3 and Phase-2. Please consider to backport this bugfix to 11_1_X both for the Phase-2 HLT TDR (@trtomei @fwyzard ) and for the MWGR (@amassiro @boudoul)

@cmsbuild cmsbuild merged commit d3fe185 into cms-sw:master Oct 14, 2020
@silviodonato silviodonato changed the title GEM - fed data size GEM - fed data size bugfix [EventFilter/GEMRawToDigi] Oct 14, 2020
@fwyzard
Copy link
Contributor

fwyzard commented Oct 14, 2020

hi Silvio, I'm not against a backport, but to make use of these changes we would need to generate new MC RAW data...

@silviodonato
Copy link
Contributor

hi Silvio, I'm not against a backport, but to make use of these changes we would need to generate new MC RAW data...

Right, the fix is in DigiToRaw, not RawToDigi !

@jshlee
Copy link
Contributor Author

jshlee commented Oct 15, 2020

I don't see the need for this to be backported as this variable (FED trailer fragmentLength) isn't used in RawToDigi process.

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.

5 participants