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

Handle Depth 7-only Signal in HcalTriggerPrimitiveAlgo #29634

Merged

Conversation

JHiltbrand
Copy link
Contributor

PR description:

This PR addresses the issue described in JIRA ticket CMSHCALTRG-9. When a signal is only in depth 7 of HCAL TT26, TT27, or TT28, the corresponding HcalTriggerPrimitiveDigi is not fully formed.

PR validation:

To understand this fix, the HcalTriggerPrimitiveAlgo code was run before and after and these depth 7 special cases were investigated. Example printout is provided below:

Prefix

EVENT 7227 | (HcalTrigTower v0: 27,37) | size() 0 | presamples() 0

Here, since the TP is not fully formed, its size() and presamples() members are left initialized at 0.

Postfix

EVENT 7227 | (HcalTrigTower v0: 27,37) | size() 4 | presamples() 2
  Value=0, FG=0
  Value=0, FG=0
  Value=0, FG=0
  Value=0, FG=0

After the fix, when the TP is fully constructed, it has valid size() and presamples() values. Likewise, there are non-zero number of HcalTriggerPrimitiveSamples.

Only one additional static const variable is added to the code.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 4, 2020

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 4, 2020

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29634/15014

  • This PR adds an extra 24KB to repository

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

@cmsbuild
Copy link
Contributor

cmsbuild commented May 4, 2020

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 4, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29634/15017

  • This PR adds an extra 24KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented May 4, 2020

A new Pull Request was created by @JHiltbrand (Joshua Hiltbrand) for master.

It involves the following packages:

SimCalorimetry/HcalTrigPrimAlgos

@cmsbuild, @rekovic, @benkrikler can you please review it and eventually sign? Thanks.
@abdoulline, @rovere this is something you requested to watch as well.
@silviodonato, @dpiparo you are the release manager for this.

cms-bot commands are listed here

@silviodonato
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/5998/console Started: 2020/05/05 11:06

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2020

-1

Tested at: b2cfec7

CMSSW: CMSSW_11_1_X_2020-05-04-2300
SCRAM_ARCH: slc7_amd64_gcc820
You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9c5875/5998/summary.html

I found follow errors while testing this PR

Failed tests: ClangBuild

  • Clang:

I found compilation error while trying to compile with clang. Command used:

USER_CUDA_FLAGS='--expt-relaxed-constexpr' USER_CXXFLAGS='-Wno-register -fsyntax-only' scram build -k -j 32 COMPILER='llvm compile'

++ scram build outputlog
Entering library rule at SimCalorimetry/HcalTrigPrimAlgos
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_1_X_2020-05-04-2300/src/SimCalorimetry/HcalTrigPrimAlgos/src/HcalFinegrainBit.cc 
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_1_X_2020-05-04-2300/src/SimCalorimetry/HcalTrigPrimAlgos/src/HcalFeatureHFEMBit.cc 
>> Compiling  /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_1_X_2020-05-04-2300/src/SimCalorimetry/HcalTrigPrimAlgos/src/HcalTriggerPrimitiveAlgo.cc 
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_1_X_2020-05-04-2300/src/SimCalorimetry/HcalTrigPrimAlgos/src/HcalTriggerPrimitiveAlgo.cc:816:59: error: expression result unused [-Werror,-Wunused-value]
        fgUpgradeMap_.insert(std::make_pair(id, element)).first;
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~
1 error generated.
gmake: *** [tmp/slc7_amd64_gcc820/src/SimCalorimetry/HcalTrigPrimAlgos/src/SimCalorimetryHcalTrigPrimAlgos/HcalTriggerPrimitiveAlgo.cc.o] Error 1
++ /data/cmsbld/jenkins/workspace/ib-run-pr-tests/cms-bot/buildLogAnalyzer.py --logDir /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_11_1_X_2020-05-04-2300/tmp/slc7_amd64_gcc820/cache/log/src


@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2020

Comparison not run due to Build errors/Fireworks only changes/No short matrix requested (RelVals and Igprof tests were also skipped)

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2020

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29634/15043

  • This PR adds an extra 24KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2020

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

@silviodonato
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/6072/console Started: 2020/05/05 19:38

@JHiltbrand JHiltbrand changed the title Handle Depth 7-only Signal in HcalTriggerPrimitiveDigi Handle Depth 7-only Signal in HcalTriggerPrimitiveAlgo May 5, 2020
@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2020

+1
Tested at: 3a7bcfe
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9c5875/6072/summary.html
CMSSW: CMSSW_11_1_X_2020-05-05-1100
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2020

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 6, 2020

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2696239
  • DQMHistoTests: Total failures: 29
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2695891
  • DQMHistoTests: Total skipped: 319
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
  • Checked 147 log files, 16 edm output root files, 34 DQM output files

@silviodonato
Copy link
Contributor

Do you have any comments @rekovic ?

@rekovic
Copy link
Contributor

rekovic commented May 17, 2020

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

@silviodonato
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit da11692 into cms-sw:master May 17, 2020
@JHiltbrand JHiltbrand deleted the fix_HcalTrigPrimAlgo_Depth7onlySignal branch September 13, 2023 20:38
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