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

EMTF unpacked muons match uGMT unpacked muons #22090

Merged
merged 6 commits into from Feb 7, 2018

Conversation

abrinke1
Copy link
Contributor

@abrinke1 abrinke1 commented Feb 2, 2018

Updates to muon sorting and kBX track address in EMTF unpacker and emulator, to match RegionalMuonCandBxCollection unpacked from uGMT. Allows uGMT-vs-EMTF and EMTF data-vs-emulator comparisons to run properly in the DQM. Small fix, significant improvement to monitoring.

Thanks to @thomreis for testing.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

A new Pull Request was created by @abrinke1 for master.

It involves the following packages:

DataFormats/L1TMuon
EventFilter/L1TRawToDigi
L1Trigger/L1TMuonEndCap

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

cms-bot commands are listed here

@thomreis
Copy link
Contributor

thomreis commented Feb 2, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/25867/console Started: 2018/02/02 14:05

Copy link
Contributor

@thomreis thomreis left a comment

Choose a reason for hiding this comment

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

The track address mismatches between data and emulator can be fixed by applying this change.

@@ -2,12 +2,11 @@

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @abrinke1 I think there is no need to change this file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why not? Don't we want the EMTF unpacker and emulator to match, wherever possible? I confirmed that L1A_BXN() in EMTFBlockSP.cc matches iEvent.bunchCrossing() in MicroGMTConverter.cc. The offset and truncation is required in both to match how the EMTF firmware fills the track address which is transmitted to the uGMT.

Copy link
Contributor

Choose a reason for hiding this comment

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

It looks as if you just changed the formatting in this file.

@@ -24,6 +25,10 @@ void MicroGMTConverter::convert(
out_cand.setHwQual ( in_track.GMT_quality() );
out_cand.setHwHF ( false ); // EMTF: halo -> 1
out_cand.setTFIdentifiers ( sector, tftype );
// Truncate to 11 bits and offset by 25 from global event BX in EMTF firmware
Copy link
Contributor

Choose a reason for hiding this comment

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

This code does not belong here. Instead it should replace line 85. https://github.com/cms-sw/cmssw/pull/22090/files#diff-0098191652eebd75579da4dd04b68427R85

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I would not put the offset in "convert_all", because "convert" can be called stand-alone, and I would not want to have to perform the truncation and shift every time I call "convert".

Copy link
Contributor

Choose a reason for hiding this comment

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

Line 85 is not in convert_all but in this function.
out_cand.setTrackSubAddress(l1t::RegionalMuonCand::kBX , in_track.BX()); is written there at the moment, and this should be replaced because it sets the kBX back to the old value.

@thomreis
Copy link
Contributor

thomreis commented Feb 2, 2018

please abort test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

Jenkins tests are aborted.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

Pull request #22090 was updated. @nsmith-, @cmsbuild, @thomreis, @rekovic can you please check and sign again.

@abrinke1
Copy link
Contributor Author

abrinke1 commented Feb 2, 2018

@thomreis all comments addressed. Thanks for the tips, and sorry for the confusion.

@thomreis
Copy link
Contributor

thomreis commented Feb 2, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/25871/console Started: 2018/02/02 16:06

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2018

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

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /build/cmsbld/jenkins/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-22090/1325.7_TTbar_13_94XNanoAODINPUT+TTbar_13_94XNanoAODINPUT+NANOEDMMC2017

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 26
  • DQMHistoTests: Total histograms compared: 2465763
  • DQMHistoTests: Total failures: 35
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2465559
  • DQMHistoTests: Total skipped: 169
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 1.18000000011 KiB( 22 files compared)
  • Checked 110 log files, 9 edm output root files, 26 DQM output files

@thomreis
Copy link
Contributor

thomreis commented Feb 3, 2018

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 3, 2018

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

@fabiocos
Copy link
Contributor

fabiocos commented Feb 7, 2018

+1

@thomreis
Copy link
Contributor

thomreis commented Feb 9, 2018

Hi @abrinke1
can you make a backport to 10_0_X of this PR please so that we can put it in the online DQM?

@abrinke1
Copy link
Contributor Author

abrinke1 commented Feb 9, 2018

Hi @thomreis
Please see PR #22169

@fabiocos
Copy link
Contributor

@thomreis if this is needed in 10_0_X for online, please mark it explicitly in the next ORP spreadsheet

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

4 participants