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

Modernize CondCore/ESSources/test #36429

Merged

Conversation

francescobrivio
Copy link
Contributor

@francescobrivio francescobrivio commented Dec 9, 2021

PR description:

Following comment in #36419 (comment) I modernized scripts in CondCore/ESSources/test to:

  • use esConsumes
  • migrated legacy EDModules to be thread-safe
  • changed cout to LogPrint

PR validation:

Code compiles

Backport:

Not a backport, no backport needed.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36429/27251

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

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

It involves the following packages:

  • CondCore/ESSources (db, alca)

@malbouis, @yuanchao, @cmsbuild, @ggovi, @francescobrivio, @tvami can you please review it and eventually sign? Thanks.
@mmusich, @tocheng this is something you requested to watch as well.
@perrotta, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

Copy link
Contributor

@mmusich mmusich left a comment

Choose a reason for hiding this comment

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

Thanks @francescobrivio, a couple of other comments.
Also I think there are more modules that could be made global (but not strong opinion, as these are test programs).

CondCore/ESSources/test/stubs/PedestalsAnalyzer.cc Outdated Show resolved Hide resolved
CondCore/ESSources/test/stubs/TestUpdater.cc Outdated Show resolved Hide resolved
@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36429/27260

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

Pull request #36429 was updated. @malbouis, @yuanchao, @cmsbuild, @ggovi, @francescobrivio, @tvami can you please check and sign again.

@francescobrivio
Copy link
Contributor Author

francescobrivio commented Dec 9, 2021

@makortel in 49807ab I added edm::one::WatchRuns (as correctly pointed out in #36429 (review)) but:

  • in PedestalsAnalyzer.cc I had to also add explicitly endRun in order to compile succesfully
  • in TestUpdater.cc no endRun is required and the compilation is successful nonetheless

As far as I understood the code should always complain in this case when endRun in not added, could you help me understand what I am missing here?

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36429/27263

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

Pull request #36429 was updated. @malbouis, @yuanchao, @cmsbuild, @ggovi, @francescobrivio, @tvami can you please check and sign again.

@mmusich
Copy link
Contributor

mmusich commented Dec 9, 2021

@francescobrivio

in 49807ab I added edm::one::WatchRuns (as correctly pointed out in suggested in ) but:

in `PedestalsAnalyzer.cc` I had to also add explicitly endRun in order to compile succesfully
in `TestUpdater.cc` no endRun is required and the compilation is successful nonetheless

As far as I understood the code should always complain in this case when endRun in not added, could you help me understand what I am missing here?

as far as I can see, that module is not even compiled:

<use name="FWCore/ParameterSet"/>
<use name="CondFormats/Calibration"/>
<use name="FWCore/Framework"/>
<use name="CondFormats/DataRecord"/>
<use name="CondFormats/BeamSpotObjects"/>
<library file="stubs/PedestalsAnalyzer.cc" name="PedestalsAnalyzer">
<flags EDM_PLUGIN="1"/>
</library>
<library file="stubs/PedestalsByLabelAnalyzer.cc" name="PedestalsByLabelAnalyzer">
<flags EDM_PLUGIN="1"/>
</library>
<library file="SiStripTest/noiseanalyzer.cc" name="NoisesAnalyzer">
<flags EDM_PLUGIN="1"/>
</library>
<library file="stubs/EfficiencyByLabelAnalyzer.cc" name="ExEfficiencyByLabelAnalyzer">
<flags EDM_PLUGIN="1"/>
</library>
<library file="stubs/TestConcurrentIOVsCondCore.cc" name="TestConcurrentIOVsCondCore">
<flags EDM_PLUGIN="1"/>
</library>
<bin file="TestCondCoreESSources.cpp" name="UnitTestConcurrentIOVsCondCore">
<flags TEST_RUNNER_ARGS=" /bin/bash CondCore/ESSources/test TestConcurrentIOVsCondCore.sh"/>
<use name="FWCore/Utilities"/>
</bin>
<library file="stubs/LumiTestReadAnalyzer.cc" name="LumiTestReadAnalyzer">
<flags EDM_PLUGIN="1"/>
</library>

@francescobrivio
Copy link
Contributor Author

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36429/27282

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

Pull request #36429 was updated. @ggovi, @malbouis, @tvami, @yuanchao, @francescobrivio can you please check and sign again.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d5d596/21150/summary.html
COMMIT: 2159f8d
CMSSW: CMSSW_12_3_X_2021-12-09-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/36429/21150/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: 42
  • DQMHistoTests: Total histograms compared: 3250704
  • DQMHistoTests: Total failures: 0
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3250682
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 41 files compared)
  • Checked 177 log files, 37 edm output root files, 42 DQM output files
  • TriggerResults: no differences found

@francescobrivio
Copy link
Contributor Author

@tvami @malbouis @ggovi this is now passing all tests nicely, please review/sign at your convenience


private:
const edm::ESGetToken<mySiStripNoises, mySiStripNoisesRcd> theNoisesToken_;
Copy link
Contributor

Choose a reason for hiding this comment

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

@francescobrivio does this token ( and all the others added ) need to be initialise with esConsumes ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's initialized few lines before (line 19):

explicit NoisesAnalyzer(edm::ParameterSet const& p) : theNoisesToken_(esConsumes())

Copy link
Contributor

Choose a reason for hiding this comment

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

@francescobrivio thanks, did not noticed...

@tvami
Copy link
Contributor

tvami commented Dec 10, 2021

+alca

@tvami
Copy link
Contributor

tvami commented Dec 12, 2021

+db

  • seems like @ggovi agreed and anyway everything is in test

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

@qliphy
Copy link
Contributor

qliphy commented Dec 13, 2021

+1

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

6 participants