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

Migrate BTV pacakges to new PoolDBOutputService #36231

Merged
merged 9 commits into from Dec 11, 2021

Conversation

panwarlsweet
Copy link
Contributor

PR description:

As introduced in issue cms-AlCaDB/AlCaTools#28, migrating to the new methods replacing writeOne --> writeOneIOV, createNewIOV --> createOneIOV, and appendSinceTime --> appendOneIOV.
The files containing PoolDBOutputService in BTV packages that were addressed are:
RecoBTag/PerformanceDB/plugins/PhysicsPerformanceDBWriterFromFile_WPandPayload.cc
RecoBTag/PerformanceDB/plugins/PhysicsPerformanceDBWriterFromFile_WPandPayload_IOV.cc
RecoBTag/PerformanceDB/plugins/PhysicsPerformanceDBWriterTFormula_fromfile_WPandPL.cc
RecoBTag/TrackProbability/test/CalibrationSkeleton.cc
RecoBTag/TrackProbability/test/TrackProbabilityXMLtoDB.cc

PR validation:

  • changes compile with CMSSW
  • scram b runtests works fine

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

N/A

@soureek @johnalison

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36231/26854

  • This PR adds an extra 28KB to repository

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

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36231/26855

  • This PR adds an extra 28KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @panwarlsweet (Lata Panwar) for master.

It involves the following packages:

  • RecoBTag/PerformanceDB (reconstruction)
  • RecoBTag/TrackProbability (reconstruction)

@jpata, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@JyothsnaKomaragiri, @emilbols, @demuller, @andrzejnovak, @AlexDeMoor 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

@tvami
Copy link
Contributor

tvami commented Nov 24, 2021

assign db

@cmsbuild
Copy link
Contributor

New categories assigned: db

@ggovi,@francescobrivio,@malbouis,@tvami you have been requested to review this Pull request/Issue and eventually sign? Thanks

calibration2d.data.push_back(entry);
}

mydbservice->createOneIOV(calibration, "BTagTrackProbability3DRcd");
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
mydbservice->createOneIOV(calibration, "BTagTrackProbability3DRcd");
mydbservice->createOneIOV(calibration, mydbservice->endOfTime(), "BTagTrackProbability3DRcd");

Copy link
Contributor Author

Choose a reason for hiding this comment

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

corrected


mydbservice->createOneIOV(calibration, "BTagTrackProbability3DRcd");

mydbservice->createOneIOV(calibration2d, "BTagTrackProbability2DRcd");
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
mydbservice->createOneIOV(calibration2d, "BTagTrackProbability2DRcd");
mydbservice->createOneIOV(calibration2d, mydbservice->endOfTime(), "BTagTrackProbability2DRcd");

Copy link
Contributor Author

Choose a reason for hiding this comment

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

corrected

else data2d[i].second = CalibratedHistogram();
}

calibrationNew =
Copy link
Contributor

Choose a reason for hiding this comment

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

I dont see where calibrationNew is deleted. But this file is under \test so fine...

Comment on lines 205 to 207
edm::ESHandle<TransientTrackBuilder> builder;
iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder",builder);
iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", builder);
m_transientTrackBuilder_producer = builder.product();
Copy link
Contributor

@tvami tvami Nov 24, 2021

Choose a reason for hiding this comment

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

Suggested change
edm::ESHandle<TransientTrackBuilder> builder;
iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder",builder);
iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", builder);
m_transientTrackBuilder_producer = builder.product();
auto const m_transientTrackBuilder_producer = &iSetup.getData(transientTrackBuilderToken_)

and you'll need to define transientTrackBuilderToken_ in the header as

const edm::ESGetToken<TransientTrackBuilder, TransientTrackRecord> transientTrackBuilderToken_;

and then consume it in the constructor of this module

Copy link
Contributor Author

Choose a reason for hiding this comment

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

implemented as suggested above

@@ -78,82 +74,70 @@ using namespace reco;
//

class TrackProbabilityXMLtoDB : public edm::EDAnalyzer {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
class TrackProbabilityXMLtoDB : public edm::EDAnalyzer {
class TrackProbabilityXMLtoDB : public edm::one::EDAnalyzer<> {

Copy link
Contributor Author

Choose a reason for hiding this comment

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

corrected

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-36231/27270

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

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

@tvami
Copy link
Contributor

tvami commented Dec 9, 2021

@cmsbuild , please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 9, 2021

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4a38a1/21135/summary.html
COMMIT: ad6e3e2
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/36231/21135/install.sh to create a dev area with all the needed externals and cmssw changes.

CMS StaticAnalyzer warnings: There are 1 EventSetupRecord::get warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4a38a1/21135/llvm-analysis/esrget-sa.txt for details.
CMS StaticAnalyzer warnings: There are 4 inherits from legacy modules warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4a38a1/21135/llvm-analysis/legacy-mod-sa.txt for details.
CMS deprecated warnings: 3 CMS deprecated warnings found, see summary page for details.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 42
  • DQMHistoTests: Total histograms compared: 3250704
  • DQMHistoTests: Total failures: 5
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 3250676
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 41 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 177 log files, 37 edm output root files, 42 DQM output files
  • TriggerResults: no differences found

@tvami
Copy link
Contributor

tvami commented Dec 9, 2021

+db

  • there is more to do with these packages (move them to a correct directory, migrate away from es get()) but it will be done in a follow-up PR
  • Jenkins tests pass

@slava77
Copy link
Contributor

slava77 commented Dec 10, 2021

+reconstruction

for #36231 ad6e3e2

  • code changes are technical, specific to the PoolDB interface update
  • jenkins tests pass
  • I expect that the warnings related to es.get will be covered in a separate PR

@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 11, 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

7 participants