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

Dedicated data members for Run-3 CSC trigger primitives #33727

Merged
merged 5 commits into from
May 28, 2021
Merged

Dedicated data members for Run-3 CSC trigger primitives #33727

merged 5 commits into from
May 28, 2021

Conversation

dildick
Copy link
Contributor

@dildick dildick commented May 13, 2021

PR description:

In previous PRs (#29456, #29205, #32880) I defined the Run-3 CSC TP formats based on a detector note DN-20-016. In the CLCT and LCT I extended the definition of existing data members with bit masks and bit shifts. It was pointed out to me that although this method is economical, it does not prevent data formats from being misinterpreted, should the bit masks or shifts change in the future. CMSSW would not record changes in bit masks and shifts as changes in the data formats, as opposed to changes in data members.

Bottom line: 1/4-strip bit, 1/8-strip bit, Run-3 pattern and slope now have corresponding data members in CLCT and LCT. In-time bits and out-of-time bits are separated in the CSCShowerDigi.

PR validation:

Tested with WF 11634.0. There should be no changes in any workflow.

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

N/A

Before submitting your pull requests, make sure you followed this checklist:

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33727/22660

  • This PR adds an extra 36KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @dildick (Sven Dildick) for master.

It involves the following packages:

DataFormats/CSCDigi
DataFormats/L1CSCTrackFinder
L1Trigger/CSCTriggerPrimitives
L1Trigger/L1TMuonEndCap

@cmsbuild, @rekovic, @civanch, @cecilecaillol, @mdhildreth can you please review it and eventually sign? Thanks.
@valuev, @rovere, @Martin-Grunewald, @dinyar, @thomreis, @ptcox 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

@civanch
Copy link
Contributor

civanch commented May 14, 2021

please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: Build
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-24836c/15088/summary.html
COMMIT: cd66349
CMSSW: CMSSW_12_0_X_2021-05-13-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33727/15088/install.sh to create a dev area with all the needed externals and cmssw changes.

Build

I found compilation error when building:

Copying tmp/slc7_amd64_gcc900/src/L1Trigger/L1TMuonEndCap/src/L1TriggerL1TMuonEndCap/libL1TriggerL1TMuonEndCap.so to productstore area:
Leaving library rule at L1Trigger/L1TMuonEndCap
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-13-2300/src/L1Trigger/L1TMuonEndCap/test/unittests/TestDebugTools.cpp
>> Building binary TestDebugTools
/cvmfs/cms-ib.cern.ch/nweek-02680/slc7_amd64_gcc900/external/gcc/9.3.0/bin/../lib/gcc/x86_64-unknown-linux-gnu/9.3.0/../../../../x86_64-unknown-linux-gnu/bin/ld: /cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc900/cms/cmssw/CMSSW_12_0_X_2021-05-13-2300/lib/slc7_amd64_gcc900/libL1TriggerL1TMuon.so: undefined reference to `CSCCorrelatedLCTDigi::getPattern() const'
collect2: error: ld returned 1 exit status
>> Deleted: tmp/slc7_amd64_gcc900/src/L1Trigger/L1TMuonEndCap/test/TestDebugTools/TestDebugTools
gmake: *** [tmp/slc7_amd64_gcc900/src/L1Trigger/L1TMuonEndCap/test/TestDebugTools/TestDebugTools] Error 1
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-05-13-2300/src/L1Trigger/L1TMuonEndCap/test/unittests/TestPhiMemoryImage.cpp
>> Building binary TestPhiMemoryImage
/cvmfs/cms-ib.cern.ch/nweek-02680/slc7_amd64_gcc900/external/gcc/9.3.0/bin/../lib/gcc/x86_64-unknown-linux-gnu/9.3.0/../../../../x86_64-unknown-linux-gnu/bin/ld: /cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc900/cms/cmssw/CMSSW_12_0_X_2021-05-13-2300/lib/slc7_amd64_gcc900/libL1TriggerL1TMuon.so: undefined reference to `CSCCorrelatedLCTDigi::getPattern() const'


@dildick
Copy link
Contributor Author

dildick commented May 14, 2021

@jiafulow Do you know why compilation of the test module is not working? CSCCorrelatedLCTDigi::getPattern() const is defined and returns pattern.

  /// return the Run-2 pattern ID
  uint16_t getPattern() const { return pattern; }

@dildick
Copy link
Contributor Author

dildick commented May 14, 2021

With the addition of <use name="DataFormats/CSCDigi"/> the XML environment for the unit tests, they seem to compile fine for me. @civanch want to give it another try?

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33727/22680

  • This PR adds an extra 36KB to repository

@cmsbuild
Copy link
Contributor

Pull request #33727 was updated. @cmsbuild, @rekovic, @civanch, @cecilecaillol, @mdhildreth can you please check and sign again.

@civanch
Copy link
Contributor

civanch commented May 16, 2021

please test

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33727/22785

@cmsbuild
Copy link
Contributor

Pull request #33727 was updated. @cmsbuild, @rekovic, @civanch, @cecilecaillol, @mdhildreth can you please check and sign again.

@dildick
Copy link
Contributor Author

dildick commented May 21, 2021

scram b runtests
****WARNING: Invalid tool py2-sympy. Please fix professor2 file.
>> Local Products Rules ..... started
>> Local Products Rules ..... done
>> Entering Package EventFilter/CSCRawToDigi
>> Creating project symlinks
>> Entering Package DataFormats/L1CSCTrackFinder
>> Entering Package DataFormats/CSCDigi
>> Leaving Package EventFilter/CSCRawToDigi
>> Package EventFilter/CSCRawToDigi built
Creating test log file logs/slc7_amd64_gcc900/testing.log
Package EventFilter/CSCRawToDigi: Running test cscRawToDigiTest
 
===== Test "cscRawToDigiTest" ====

---> test cscRawToDigiTest succeeded
 
^^^^ End Test cscRawToDigiTest ^^^^
>> Tests for package EventFilter/CSCRawToDigi ran.

@dildick
Copy link
Contributor Author

dildick commented May 24, 2021

@civanch Can you restart the tests, please?

@civanch
Copy link
Contributor

civanch commented May 24, 2021

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-24836c/15274/summary.html
COMMIT: 60d05fb
CMSSW: CMSSW_12_0_X_2021-05-24-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33727/15274/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: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 37
  • DQMHistoTests: Total histograms compared: 2650486
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2650463
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 36 files compared)
  • Checked 155 log files, 37 edm output root files, 37 DQM output files
  • TriggerResults: no differences found

@dildick
Copy link
Contributor Author

dildick commented May 25, 2021

Only 1 failed comparison, from pixel in WF 8.0.

@civanch @cecilecaillol Can you sign, please?

@civanch
Copy link
Contributor

civanch commented May 26, 2021

+1

@dildick
Copy link
Contributor Author

dildick commented May 27, 2021

@cecilecaillol Can this be merged as well?

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

@dildick
Copy link
Contributor Author

dildick commented May 28, 2021

@qliphy Can this PR be merged? Thanks.

@qliphy
Copy link
Contributor

qliphy commented May 28, 2021

+1

@cmsbuild cmsbuild merged commit 025e9cc into cms-sw:master May 28, 2021
@dildick dildick deleted the from-CMSSW_12_0_X_2021-05-12-1100-data-members-run3-variables branch May 28, 2021 03:09
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.

7 participants