Implement fillDescriptions() for producers in RecoParticleFlow/PFSimProducer #32342

guitargeek · 2020-11-30T19:22:38Z

PR description:

Implement fillDescriptions() for producers in RecoParticleFlow/PFSimProducer to address issue #29449 and merge .h files with .cc files in RecoParticleFlow/PFSimProducer/plugins.

PR validation:

CMSSW compiles, local matrix tests pass.

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

No backport intended.

cmsbuild · 2020-11-30T19:29:49Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-32342/20171

This PR adds an extra 36KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py modified in PR(s): MLPF: first integration of EDProducer and training code #32048

cmsbuild · 2020-11-30T19:30:11Z

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

It involves the following packages:

RecoParticleFlow/Configuration
RecoParticleFlow/PFProducer
RecoParticleFlow/PFSimProducer
RecoParticleFlow/PFTracking

@perrotta, @jpata, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@mmarionncern, @makortel, @cbernet, @rovere, @lgray, @lecriste, @hatakeyamak, @seemasharmafnal 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

silviodonato · 2020-12-02T14:17:01Z

please test

cmsbuild · 2020-12-02T14:17:35Z

The tests are being triggered in jenkins.

CMSSW_11_3_X_2020-12-01-2300/slc7_amd64_gcc900: https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/11272/console Started: 2020/12/02 15:19

cmsbuild · 2020-12-02T15:45:17Z

+1
Tested at: 5533ce7
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6f5200/11272/summary.html
CMSSW: CMSSW_11_3_X_2020-12-01-2300
SCRAM_ARCH: slc7_amd64_gcc900

cmsbuild · 2020-12-02T17:06:21Z

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6f5200/11272/summary.html

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 4 differences found in the comparisons
DQMHistoTests: Total files compared: 35
DQMHistoTests: Total histograms compared: 2529593
DQMHistoTests: Total failures: 7
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2529564
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
Checked 148 log files, 37 edm output root files, 35 DQM output files

hatakeyamak · 2020-12-02T17:47:32Z

Thanks. Just adding @kdlong here, as he is looking over various truth definitions for PF.

perrotta · 2020-12-04T08:03:37Z

RecoParticleFlow/PFSimProducer/plugins/ConvBremSeedProducer.cc

+
+#include <memory>
+
+class ConvBremSeedProducer : public edm::EDProducer {


I have the impression that this module is obsolete, and it could even be remved from CMSSW: if so, maybe better doing it now, and avoid uselessly spending time in maintaining it in the future.
Otherwise, since you already spent some time in updating it, you could also do a little step forward and make it a stream module, instead of a legacy one.

perrotta · 2020-12-04T08:06:26Z

RecoParticleFlow/PFSimProducer/plugins/ConvBremSeedProducer.cc

+void ConvBremSeedProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  // convBremSeeds
+  edm::ParameterSetDescription desc;
+  desc.add<edm::InputTag>("stereorecHits", edm::InputTag("gsStripRecHits", "stereoRecHit"));


This parameter does not seem to be needed: remove

perrotta · 2020-12-04T08:13:52Z

RecoParticleFlow/PFSimProducer/plugins/EcalBarrelClusterFastTimer.cc

+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/Utilities/interface/isFinite.h"


perrotta · 2020-12-04T08:39:09Z

RecoParticleFlow/PFSimProducer/plugins/PFSimParticleProducer.cc

@@ -92,11 +167,9 @@ PFSimParticleProducer::PFSimParticleProducer(const edm::ParameterSet& iConfig) {

  particleFilter_ = iConfig.getParameter<ParameterSet>("ParticleFilter");

-  mySimEvent = new FSimEvent(particleFilter_);
+  mySimEvent = std::make_unique<FSimEvent>(particleFilter_);


Since you are on it, please also remove the (commented out) lines 201-204 below

perrotta · 2020-12-04T08:42:54Z

RecoParticleFlow/PFSimProducer/plugins/SimPFProducer.cc

+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/Utilities/interface/isFinite.h"


perrotta · 2020-12-04T10:37:33Z

RecoParticleFlow/PFSimProducer/plugins/SimPFProducer.cc

+  desc.add<edm::InputTag>("gsfTrackSrc", {"electronGsfTracks"});
+
+  // if useTiming_
+  desc.add<edm::InputTag>("trackTimeValueMap", {});


The logic of the code as it is now assumes that the bool useTiming_ is true if conf.existsAs<edm::InputTag>("trackTimeValueMap"), and false otherwise.

But if you define "trackTimeValueMap" in the fillDescriptions method, then useTiming_ can never be false.

This doesn't get exposed now because this simPFProducer module is only used in Phase2 with Timing, and therefore there is no current use case for useTiming_ being false. However, this is a bug that must be fixed.

There are probably several ways out, but I think that the easiest and cleanest way for doing it is simply addOptional all these paramaters, without providing here any initialization value. As such those parameters will only get inserted by the modifier in RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py, and will not be present in unmodified configurations.

Thanks a lot, I didn't know about addOptional!

…roducer

cmsbuild · 2020-12-04T12:11:15Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-32342/20255

This PR adds an extra 28KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py modified in PR(s): MLPF: first integration of EDProducer and training code #32048

cmsbuild · 2020-12-04T12:11:40Z

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

perrotta · 2020-12-04T12:53:40Z

please test

cmsbuild · 2020-12-04T14:20:11Z

+1
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6f5200/11337/summary.html
CMSSW: CMSSW_11_3_X_2020-12-04-1100
SCRAM_ARCH: slc7_amd64_gcc900

cmsbuild · 2020-12-04T15:40:35Z

Comparison results are now available
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6f5200/11337/summary.html
CMSSW: CMSSW_11_3_X_2020-12-04-1100
SCRAM_ARCH: slc7_amd64_gcc900

Comparison Summary:

No significant changes to the logs found
Reco comparison results: 0 differences found in the comparisons
DQMHistoTests: Total files compared: 35
DQMHistoTests: Total histograms compared: 2529593
DQMHistoTests: Total failures: 1
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2529570
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
Checked 148 log files, 37 edm output root files, 35 DQM output files

perrotta · 2020-12-04T16:07:35Z

+1

fillDescriptions() implemented for the producers in RecoParticleFlow/PFSimProducer as intended, plus some collapse of the previous header+implementation structure of a few plugins into one single file
Jenkins tests pass and show no differences wrt baseline
In the package there are probably a few outdated or unused plugins (e.g. TauHadronDecayFilter, ConvBremSeedProducer, ...) that could be more conveniently removed, to avoid unnecessary maintenance work in the future (@hatakeyamak @bendavid)

cmsbuild · 2020-12-04T16:07:59Z

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 · 2020-12-04T17:34:01Z

+1

cmsbuild added this to the CMSSW_11_3_X milestone Nov 30, 2020

cmsbuild added code-checks-pending comparison-pending orp-pending pending-signatures reconstruction-pending tests-pending labels Nov 30, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Nov 30, 2020

cmsbuild added tests-started and removed tests-pending labels Dec 2, 2020

cmsbuild mentioned this pull request Dec 2, 2020

MLPF: first integration of EDProducer and training code #32048

Merged

cmsbuild added tests-approved and removed tests-started labels Dec 2, 2020

cmsbuild added comparison-available and removed comparison-pending labels Dec 2, 2020

perrotta reviewed Dec 4, 2020

View reviewed changes

guitargeek added 3 commits December 4, 2020 12:22

merge .h with .cc files in PFSimProducer

dad8be8

Implement fillDescriptions() for producers in RecoParticleFlow/PFSimP…

2d7d239

…roducer

implement review comments

b1e869b

cmsbuild removed code-checks-approved comparison-available tests-approved labels Dec 4, 2020

cmsbuild added code-checks-pending tests-pending labels Dec 4, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Dec 4, 2020

cmsbuild added tests-started and removed tests-pending labels Dec 4, 2020

cmsbuild added tests-approved and removed tests-started labels Dec 4, 2020

cmsbuild added fully-signed reconstruction-approved and removed pending-signatures reconstruction-pending labels Dec 4, 2020

cmsbuild added orp-approved and removed orp-pending labels Dec 4, 2020

cmsbuild merged commit d85160d into cms-sw:master Dec 4, 2020

perrotta mentioned this pull request Dec 4, 2020

Implement fillDescriptions() for producers in RecoParticleFlow/PFSimProducer #29449

Closed

guitargeek deleted the PFSimProducer_1 branch December 4, 2020 19:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement fillDescriptions() for producers in RecoParticleFlow/PFSimProducer #32342

Implement fillDescriptions() for producers in RecoParticleFlow/PFSimProducer #32342

guitargeek commented Nov 30, 2020

cmsbuild commented Nov 30, 2020

cmsbuild commented Nov 30, 2020

silviodonato commented Dec 2, 2020

cmsbuild commented Dec 2, 2020 •

edited

Loading

cmsbuild commented Dec 2, 2020

cmsbuild commented Dec 2, 2020

hatakeyamak commented Dec 2, 2020

perrotta Dec 4, 2020

perrotta Dec 4, 2020

perrotta Dec 4, 2020

perrotta Dec 4, 2020

perrotta Dec 4, 2020

perrotta Dec 4, 2020

guitargeek Dec 4, 2020

cmsbuild commented Dec 4, 2020

cmsbuild commented Dec 4, 2020

perrotta commented Dec 4, 2020

cmsbuild commented Dec 4, 2020

cmsbuild commented Dec 4, 2020

perrotta commented Dec 4, 2020

cmsbuild commented Dec 4, 2020

silviodonato commented Dec 4, 2020


		#include <memory>

		class ConvBremSeedProducer : public edm::EDProducer {

Implement fillDescriptions() for producers in RecoParticleFlow/PFSimProducer #32342

Implement fillDescriptions() for producers in RecoParticleFlow/PFSimProducer #32342

Conversation

guitargeek commented Nov 30, 2020

PR description:

PR validation:

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

cmsbuild commented Nov 30, 2020

cmsbuild commented Nov 30, 2020

silviodonato commented Dec 2, 2020

cmsbuild commented Dec 2, 2020 • edited Loading

cmsbuild commented Dec 2, 2020

cmsbuild commented Dec 2, 2020

hatakeyamak commented Dec 2, 2020

perrotta Dec 4, 2020

Choose a reason for hiding this comment

perrotta Dec 4, 2020

Choose a reason for hiding this comment

perrotta Dec 4, 2020

Choose a reason for hiding this comment

perrotta Dec 4, 2020

Choose a reason for hiding this comment

perrotta Dec 4, 2020

Choose a reason for hiding this comment

perrotta Dec 4, 2020

Choose a reason for hiding this comment

guitargeek Dec 4, 2020

Choose a reason for hiding this comment

cmsbuild commented Dec 4, 2020

cmsbuild commented Dec 4, 2020

perrotta commented Dec 4, 2020

cmsbuild commented Dec 4, 2020

cmsbuild commented Dec 4, 2020

perrotta commented Dec 4, 2020

cmsbuild commented Dec 4, 2020

silviodonato commented Dec 4, 2020

cmsbuild commented Dec 2, 2020 •

edited

Loading