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

Merge .h and .cc files of PhysicsTools/PatAlgos plugins #34307

Merged
merged 1 commit into from Jul 5, 2021
Merged

Merge .h and .cc files of PhysicsTools/PatAlgos plugins #34307

merged 1 commit into from Jul 5, 2021

Conversation

guitargeek
Copy link
Contributor

@guitargeek guitargeek commented Jul 1, 2021

PR description:

Part of the series of PRs that merges .h files with the .cc files of the plugins in the PhysicsTools subsystem.

This has already been done for RecoEgamma, RecoEcal, and RecoParticleFlow subsystems (see e.g. #34069, etc.).

It makes maintaining the plugins much easier and also excludes the possibility to wrongly include plugin header files.

There were the steps taken to merge the files:

  • copy-paste
  • sort includes
  • removed duplicate and unnecessary includes

PR validation:

CMSSW compiles.

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

No backport intended.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2021

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34307/23639

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2021

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34307/23640

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 1, 2021

A new Pull Request was created by @guitargeek (Jonas Rembser) for master.

It involves the following packages:

PhysicsTools/PatAlgos

@perrotta, @jpata, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@rappoccio, @gouskos, @jdolen, @JyothsnaKomaragiri, @ahinzmann, @schoef, @emilbols, @swozniewski, @jdamgov, @mbluj, @nhanvtran, @gkasieczka, @clelange, @hatakeyamak, @ferencek, @gpetruc, @andrzejnovak, @mariadalfonso, @seemasharmafnal, @mmarionncern 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

@slava77
Copy link
Contributor

slava77 commented Jul 1, 2021

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 2, 2021

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c98ed1/16399/summary.html
COMMIT: 00c73ca
CMSSW: CMSSW_12_0_X_2021-07-01-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34307/16399/install.sh to create a dev area with all the needed externals and cmssw changes.

CMS StaticAnalyzer warnings: There are 10 EventSetupRecord::get warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c98ed1/16399/llvm-analysis/esrget-sa.txt for details.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 38
  • DQMHistoTests: Total histograms compared: 2785711
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2785688
  • 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

Copy link
Contributor

@perrotta perrotta left a comment

Choose a reason for hiding this comment

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

I'm puzzled by PhysicsTools/PatAlgos/plugins/PATPrimaryVertexCleaner.cc, which is said to be an "empty file" in the github diff, but it actually does exist with its content (as it should) even after the PR...

@@ -1,11 +1,61 @@
#include "ModifiedObjectProducer.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

The file can be renamed with the class name (i.e. without the final "s", as it was the case for the .h before)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay!

// -*- C++ -*-
//
// Package: PatShapeAna
// Class: PatShapeAna
//
/**\class PatShapeAna PatShapeAna.cc PhysicsTools/PatShapeAna/src/PatShapeAna.cc
/**\class PatShapeAna
Copy link
Contributor

Choose a reason for hiding this comment

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

Since you already modified the name, why not to fix it then?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure!

#include "PhysicsTools/PatAlgos/plugins/PATTriggerMatchSelector.h"
#include "CommonTools/UtilAlgos/interface/PhysObjectMatcher.h"
/**
\class pat::PATTriggerMatchSelector PATTriggerMatchSelector.h "PhysicsTools/PatAlgos/plugins/PATTriggerMatchSelector.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

Since the file name has changed, maybe also those comments should

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay

@@ -70,6 +70,14 @@
patJetCorrFactors
)

from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X
Copy link
Contributor

Choose a reason for hiding this comment

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

This is from #33928: a rebase could get rid of these spurious additions in the diff

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for spotting, I made some mistakes when moving around directories.

@@ -152,7 +152,7 @@ def toolCode( self, process ):
trigEvtProdMod = getattr( process, triggerEventProducer )
trigEvtProdMod.processName = hltProcess
trigEvtProdMod.patTriggerProducer = cms.InputTag( triggerProducer )
if not path is '':
Copy link
Contributor

Choose a reason for hiding this comment

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

This is from #34253: a rebase could get rid of these spurious additions in the diff

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for spotting, I made some mistakes when moving around directories.

@guitargeek
Copy link
Contributor Author

Hi Andrea, thanks for the review! I'll update the PR in a second.

About the PATPrimaryVertexCleaner.cc: I only fixed the permissions from 755 to 644, as it was the only file in the 'plugins' directory that wrongly was marked executable. You can even see it in the GitHub diff, and the Empty file. just means that the actual diff of the file content is empty.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 3, 2021

-1

Failed Tests: RelVals
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c98ed1/16440/summary.html
COMMIT: 2728f17
CMSSW: CMSSW_12_0_X_2021-07-03-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34307/16440/install.sh to create a dev area with all the needed externals and cmssw changes.

CMS StaticAnalyzer warnings: There are 10 EventSetupRecord::get warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c98ed1/16440/llvm-analysis/esrget-sa.txt for details.

RelVals

The relvals timed out after 4 hours.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 4, 2021

Pull request #34307 was updated. @perrotta, @jpata, @cmsbuild, @slava77 can you please check and sign again.

@perrotta
Copy link
Contributor

perrotta commented Jul 4, 2021

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 4, 2021

-1

Failed Tests: UnitTests RelVals RelVals-INPUT AddOn
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c98ed1/16448/summary.html
COMMIT: 2919f37
CMSSW: CMSSW_12_0_X_2021-07-03-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34307/16448/install.sh to create a dev area with all the needed externals and cmssw changes.

Unit Tests

I found errors in the following unit tests:

---> test runtestPhysicsToolsPatAlgos had ERRORS

RelVals

----- Begin Fatal Exception 04-Jul-2021 12:51:17 CEST-----------------------
An exception of category 'NoProxyException' occurred while
   [0] Processing  Event run: 319450 lumi: 31 event: 42789123 stream: 0
   [1] Running path 'nanoAOD_step'
   [2] Calling method for module JetCorrFactorsProducer/'patJetCorrFactorsReapplyJEC'
Exception Message:
No data of type "JetCorrectorParametersCollection" with label "" in record "JetCorrectionsRecord"
 Please add an ESSource or ESProducer to your job which can deliver this data.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 04-Jul-2021 12:51:56 CEST-----------------------
An exception of category 'NoProxyException' occurred while
   [0] Processing  Event run: 305064 lumi: 36 event: 55020723 stream: 0
   [1] Running path 'dqmofflineOnPAT_step'
   [2] Prefetching for module SingleTopTChannelLeptonDQM_miniAOD/'singleTopElectronMediumDQM_miniAOD'
   [3] Prefetching for module PATJetSelector/'slimmedJets'
   [4] Prefetching for module PATJetUpdater/'updatedPatJetsTransientCorrectedSlimmedDeepFlavour'
   [5] Prefetching for module PATJetUpdater/'updatedPatJetsSlimmedDeepFlavour'
   [6] Prefetching for module PATJetSlimmer/'slimmedJetsNoDeepFlavour'
   [7] Prefetching for module PATJetSelector/'selectedPatJets'
   [8] Prefetching for module PATJetProducer/'patJets'
   [9] Calling method for module JetCorrFactorsProducer/'patJetCorrFactors'
Exception Message:
No data of type "JetCorrectorParametersCollection" with label "" in record "JetCorrectionsRecord"
 Please add an ESSource or ESProducer to your job which can deliver this data.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 04-Jul-2021 12:51:56 CEST-----------------------
An exception of category 'NoProxyException' occurred while
   [0] Processing  Event run: 277069 lumi: 81 event: 36026102 stream: 0
   [1] Running path 'dqmofflineOnPAT_step'
   [2] Prefetching for module SingleTopTChannelLeptonDQM_miniAOD/'singleTopElectronMediumDQM_miniAOD'
   [3] Prefetching for module PATJetSelector/'slimmedJets'
   [4] Prefetching for module PATJetUpdater/'updatedPatJetsTransientCorrectedSlimmedDeepFlavour'
   [5] Prefetching for module PATJetUpdater/'updatedPatJetsSlimmedDeepFlavour'
   [6] Prefetching for module PATJetSlimmer/'slimmedJetsNoDeepFlavour'
   [7] Prefetching for module PATJetSelector/'selectedPatJets'
   [8] Prefetching for module PATJetProducer/'patJets'
   [9] Calling method for module JetCorrFactorsProducer/'patJetCorrFactors'
Exception Message:
No data of type "JetCorrectorParametersCollection" with label "" in record "JetCorrectionsRecord"
 Please add an ESSource or ESProducer to your job which can deliver this data.
----- End Fatal Exception -------------------------------------------------
Expand to see more relval errors ...

RelVals-INPUT

  • 4.64.6_MinimumBias2010A+MinimumBias2010A+RECOSKIMALCA+HARVESTDR1/step2_MinimumBias2010A+MinimumBias2010A+RECOSKIMALCA+HARVESTDR1.log
  • 136.72411136.72411_RunJetHT2016B_reminiaodUL+RunJetHT2016B_reminiaodUL+REMINIAOD_data2016UL_HIPM+HARVESTDR2_REMINIAOD_data2016UL_HIPM/step2_RunJetHT2016B_reminiaodUL+RunJetHT2016B_reminiaodUL+REMINIAOD_data2016UL_HIPM+HARVESTDR2_REMINIAOD_data2016UL_HIPM.log
  • 136.7611136.7611_RunJetHT2016E_reminiaod+RunJetHT2016E_reminiaod+REMINIAOD_data2016_HIPM+HARVESTDR2_REMINIAOD_data2016_HIPM/step2_RunJetHT2016E_reminiaod+RunJetHT2016E_reminiaod+REMINIAOD_data2016_HIPM+HARVESTDR2_REMINIAOD_data2016_HIPM.log
Expand to see more relval errors ...

AddOn Tests

----- Begin Fatal Exception 04-Jul-2021 12:54:12 CEST-----------------------
An exception of category 'NoProxyException' occurred while
   [0] Processing  Event run: 1 lumi: 1 event: 4 stream: 3
   [1] Running path 'validation_step'
   [2] Prefetching for module BDHadronTrackMonitoringAnalyzer/'BDHadronTrackMonitoringAnalyze'
   [3] Prefetching for module PATJetProducer/'patJetsBDHadron'
   [4] Calling method for module JetCorrFactorsProducer/'patJetCorrFactors'
Exception Message:
No data of type "JetCorrectorParametersCollection" with label "" in record "JetCorrectionsRecord"
 Please add an ESSource or ESProducer to your job which can deliver this data.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 04-Jul-2021 12:51:22 CEST-----------------------
An exception of category 'NoProxyException' occurred while
   [0] Processing  Event run: 1 lumi: 1 event: 2 stream: 0
   [1] Running path 'p'
   [2] Prefetching for module CandidateSummaryTable/'selectedPatCandidateSummary'
   [3] Prefetching for module PATJetSelector/'selectedPatJets'
   [4] Prefetching for module PATJetProducer/'patJets'
   [5] Calling method for module JetCorrFactorsProducer/'patJetCorrFactors'
Exception Message:
No data of type "JetCorrectorParametersCollection" with label "" in record "JetCorrectionsRecord"
 Please add an ESSource or ESProducer to your job which can deliver this data.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 04-Jul-2021 12:54:48 CEST-----------------------
An exception of category 'NoProxyException' occurred while
   [0] Processing  Event run: 1 lumi: 1 event: 4 stream: 1
   [1] Running path 'validation_step'
   [2] Prefetching for module BDHadronTrackMonitoringAnalyzer/'BDHadronTrackMonitoringAnalyze'
   [3] Prefetching for module PATJetProducer/'patJetsBDHadron'
   [4] Calling method for module JetCorrFactorsProducer/'patJetCorrFactors'
Exception Message:
No data of type "JetCorrectorParametersCollection" with label "" in record "JetCorrectionsRecord"
 Please add an ESSource or ESProducer to your job which can deliver this data.
----- End Fatal Exception -------------------------------------------------
Expand to see more addon errors ...

@perrotta
Copy link
Contributor

perrotta commented Jul 4, 2021

@guitargeek , also given the errors in the tests: what about reverting the last commit and descope the ESProducer migration to a follow-up PR? I was basically ready to sign the "merge" PR before that commit, and not requiring other signatures it could have been merged rather quickly...

@guitargeek
Copy link
Contributor Author

@perrotta, okay I didn't expect you to want to merge this with the static analyzer report with the EventSetupRecord::get warnings. But it sounds good to address them in a separate PR. I'll remove the last commit again.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 4, 2021

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c98ed1/16442/summary.html
COMMIT: 2728f17
CMSSW: CMSSW_12_0_X_2021-07-03-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34307/16442/install.sh to create a dev area with all the needed externals and cmssw changes.

CMS StaticAnalyzer warnings: There are 10 EventSetupRecord::get warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c98ed1/16442/llvm-analysis/esrget-sa.txt for details.

RelVals-INPUT

The relvals timed out after 4 hours.

  • 4.224.22_RunCosmics2011A+RunCosmics2011A+RECOCOSD+ALCACOSD+SKIMCOSD+HARVESTDC/step2_RunCosmics2011A+RunCosmics2011A+RECOCOSD+ALCACOSD+SKIMCOSD+HARVESTDC.log
  • 8.08.0_BeamHalo+BeamHaloINPUT+DIGICOS+RECOCOS+ALCABH+HARVESTCOS/step2_BeamHalo+BeamHaloINPUT+DIGICOS+RECOCOS+ALCABH+HARVESTCOS.log
  • 6.06.0_SingleMuPt1+SingleMuPt1INPUT+DIGI+RECO+HARVEST/step2_SingleMuPt1+SingleMuPt1INPUT+DIGI+RECO+HARVEST.log
Expand to see more relval errors ...

Comparison Summary

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: 2785924
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2785895
  • 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

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 4, 2021

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c98ed1/16449/summary.html
COMMIT: 2728f17
CMSSW: CMSSW_12_0_X_2021-07-03-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34307/16449/install.sh to create a dev area with all the needed externals and cmssw changes.

CMS StaticAnalyzer warnings: There are 10 EventSetupRecord::get warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-c98ed1/16449/llvm-analysis/esrget-sa.txt 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: 38
  • DQMHistoTests: Total histograms compared: 2785924
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2785895
  • 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

@guitargeek guitargeek changed the title Merge .h and .cc files of PhysicsTools/PatAlgos plugins and ESGetToken migration Merge .h and .cc files of PhysicsTools/PatAlgos plugins Jul 4, 2021
@perrotta
Copy link
Contributor

perrotta commented Jul 4, 2021

+reconstruction

  • technical
  • jenkins tests pass and show no differences wrt baseline

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 4, 2021

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)

@qliphy
Copy link
Contributor

qliphy commented Jul 5, 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

5 participants