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

[HGCAL] Fix deprecated method for ESHandle #33412

Merged
merged 13 commits into from Apr 26, 2021

Conversation

ebrondol
Copy link
Contributor

@ebrondol ebrondol commented Apr 12, 2021

PR description:

Fix ESHandle for many HGCal modules.
Twiki pages used here and here.

PR validation:

  • runTheMatrix 23293.0_CloseByParticleGun successful

thanks to @makortel for the help

@ebrondol
Copy link
Contributor Author

informing @felicepantaleo and @rovere

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33412/22053

ERROR: Build errors found during clang-tidy run.

RecoParticleFlow/PFTracking/plugins/HGCalTrackCollectionProducer.cc:59:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
RecoParticleFlow/PFTracking/plugins/HGCalTrackCollectionProducer.cc:91:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
RecoParticleFlow/PFTracking/plugins/HGCalTrackCollectionProducer.cc:117:1: error: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
RecoParticleFlow/PFTracking/plugins/HGCalTrackCollectionProducer.cc:154:59: error: use of undeclared identifier 'bFieldToken_' [clang-diagnostic-error]
  edm::ESHandle<MagneticField> bField_ = iSetup.getHandle(bFieldToken_);
                                                          ^
RecoParticleFlow/PFTracking/plugins/HGCalTrackCollectionProducer.cc:155:61: error: use of undeclared identifier 'trkGeomToken_'; did you mean 'tkerGeomToken_'? [clang-diagnostic-error]
  edm::ESHandle<TrackerGeometry> tkGeom_ = iSetup.getHandle(trkGeomToken_);
                                                            ^~~~~~~~~~~~~
                                                            tkerGeomToken_
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:128: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33412/22069

ERROR: Build errors found during clang-tidy run.

RecoParticleFlow/PFTracking/plugins/HGCalTrackCollectionProducer.cc:136:59: error: use of undeclared identifier 'bFieldToken_' [clang-diagnostic-error]
  edm::ESHandle<MagneticField> bField_ = iSetup.getHandle(bFieldToken_);
                                                          ^
RecoParticleFlow/PFTracking/plugins/HGCalTrackCollectionProducer.cc:137:61: error: use of undeclared identifier 'trkGeomToken_'; did you mean 'tkerGeomToken_'? [clang-diagnostic-error]
  edm::ESHandle<TrackerGeometry> tkGeom_ = iSetup.getHandle(trkGeomToken_);
                                                            ^~~~~~~~~~~~~
                                                            tkerGeomToken_
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:128: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33412/22070

  • This PR adds an extra 60KB to repository

@felicepantaleo
Copy link
Contributor

@cmsbuild please test

@silviodonato
Copy link
Contributor

silviodonato commented Apr 26, 2021

test parameters:

  • workflows = 34694.0,34695.0,34696.0,34700.0
  • relvals_opt = --what standard,highstats,pileup,generator,production,ged,machine,premix,upgrade

1 similar comment
@silviodonato
Copy link
Contributor

test parameters:

  • workflows = 34694.0,34695.0,34696.0,34700.0
  • relvals_opt = --what standard,highstats,pileup,generator,production,ged,machine,premix,upgrade

@silviodonato
Copy link
Contributor

@cmsbuild ping

@silviodonato
Copy link
Contributor

please test

@silviodonato
Copy link
Contributor

please abort

@silviodonato
Copy link
Contributor

test parameters:

  • workflows = 34694.0,34695.0,34696.0,34700.0
  • relvals_opt = --what standard,highstats,pileup,generator,production,ged,machine,premix,upgrade

@silviodonato
Copy link
Contributor

please test

@silviodonato
Copy link
Contributor

I don't see the "like" reaction from @cmsbuild , but I can read
bot/33412/test_parameters — {"EXTRA_MATRIX_ARGS": "--what standard,highstats,pileup,generator,production,ged,machine,premix,upgrade", "MATRIX_EXTRAS": "34694.0,346...
so the parameters should be ok

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ab3548/14572/summary.html
COMMIT: 9530caa
CMSSW: CMSSW_12_0_X_2021-04-25-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33412/14572/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

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

  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-ab3548/34694.0_CloseByPGun_CE_E_Front_300um+2026D76+CE_E_Front_300um_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal
  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-ab3548/34695.0_CloseByPGun_CE_E_Front_200um+2026D76+CE_E_Front_200um_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal
  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-ab3548/34696.0_CloseByPGun_CE_E_Front_120um+2026D76+CE_E_Front_120um_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal
  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-ab3548/34700.0_CloseByPGun_CE_H_Coarse_Scint+2026D76+CE_H_Coarse_Scint_GenSimHLBeamSpot+DigiTrigger+RecoGlobal+HARVESTGlobal

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 38
  • DQMHistoTests: Total histograms compared: 2877605
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2877576
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 37 files compared)
  • Checked 160 log files, 37 edm output root files, 38 DQM output files
  • TriggerResults: no differences found

@smuzaffar
Copy link
Contributor

smuzaffar commented Apr 26, 2021

@silviodonato , @qliphy @makortel how about changing bot to use --what list,of,defaults if extra workflows are requested and possibly merge any --what name provided via test parameter. e.g. user can provide --what upgrade only and bot can add the rest of defaults . bot can run the following to get the defaults

runTheMatrix.py -n | grep '^processing relval_' | sed 's|^.*relval_||' | tr '\n' ','
standard,highstats,pileup,generator,extendedgen,production,ged,2017,2026,machine,premix

@silviodonato
Copy link
Contributor

@smuzaffar there is a problem with the duplicated workflows. The workflows in 2017, 2026, and gpu are taken from upgrade. I added a protection to avoid running on duplicated workflows (see https://github.com/silviodonato/cmssw/blob/master/Configuration/PyReleaseValidation/scripts/runTheMatrix.py#L33), so you cannot run with --what upgrade,2017. Let's discuss about this tomorrow at the ORP meeting

@smuzaffar
Copy link
Contributor

ah ok

@srimanob
Copy link
Contributor

+Upgrade

This is a technical PR to handle ESHandle HGCal modules. No change is expected.

@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

@cmsbuild cmsbuild merged commit 43add03 into cms-sw:master Apr 26, 2021
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