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

drop type specs in RecoParticleFlow #31389

Merged
merged 2 commits into from Sep 9, 2020
Merged

Conversation

jeongeun
Copy link
Contributor

@jeongeun jeongeun commented Sep 8, 2020

PR description:

Update the safer syntax for existing parameter :

  • drop type specifications where the original parameter exists.
  • move all parameter inside the clone

Instead of modifying parameters with full type specs, which can be interpreted as an insertion of a new parameter, it is a safer way to protect from parameter name mistakes and will also help in possible parameter migrations.
(The references were PR#30700, PR#30827, PR#30947,PR#31162,PR#31243,PR#31332)

In this PR, total 19 files updated.

  • RecoParticleFlow/{Configuration} 2 files
  • RecoParticleFlow/{PFClusterProducer} 10 files
  • RecoParticleFlow/{PFProducer} 5 files
  • RecoParticleFlow/{PFTracking} 2 files

PR validation:

Event Content comparison check was also done and there is no change with these updates.
Tested in CMSSW_11_2_X, the basic test all passed in the CMSSW PR instructions.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 8, 2020

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 8, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31389/18234

  • This PR adds an extra 28KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 8, 2020

A new Pull Request was created by @jeongeun (JeongEun Lee) for master.

It involves the following packages:

RecoParticleFlow/Configuration
RecoParticleFlow/PFClusterProducer
RecoParticleFlow/PFProducer
RecoParticleFlow/PFTracking

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

@perrotta
Copy link
Contributor

perrotta commented Sep 8, 2020

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 8, 2020

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 8, 2020

+1
Tested at: 786ae10
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9fbfff/9194/summary.html
CMSSW: CMSSW_11_2_X_2020-09-08-1100
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 8, 2020

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 8, 2020

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9fbfff/9194/summary.html

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: 2609667
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2609644
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
  • Checked 149 log files, 22 edm output root files, 35 DQM output files

pfCandidates = "particleFlowTmp",
valueMapPhoPFblockIso = "gedPhotonsTmp",
valueMapElePFblockIso = "gedGsfElectronsTmp"
)
#change particleBasedIsolation object to tmp
IsoConeDefinitionsPhotonsTmp = copy.deepcopy(IsoConeDefinitions)
for iPSet in IsoConeDefinitionsPhotonsTmp:
iPSet.particleBasedIsolation = cms.InputTag("particleBasedIsolationTmp", "gedPhotonsTmp")
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
iPSet.particleBasedIsolation = cms.InputTag("particleBasedIsolationTmp", "gedPhotonsTmp")
iPSet.particleBasedIsolation = "particleBasedIsolationTmp:gedPhotonsTmp"

srcToIsolate = "gedGsfElectronsTmp",
srcForIsolationCone = "pfNoPileUpCandidates"
)

for iPSet in egmElectronIsolationCITK.isolationConeDefinitions:
iPSet.particleBasedIsolation = cms.InputTag("particleBasedIsolationTmp", "gedGsfElectronsTmp")
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
iPSet.particleBasedIsolation = cms.InputTag("particleBasedIsolationTmp", "gedGsfElectronsTmp")
iPSet.particleBasedIsolation = "particleBasedIsolationTmp:gedGsfElectronsTmp"

srcToIsolate = "gedGsfElectronsTmp",
srcForIsolationCone = "pfPileUpAllChargedParticles"
)

for iPSet in egmElectronIsolationPileUpCITK.isolationConeDefinitions:
iPSet.particleBasedIsolation = cms.InputTag("particleBasedIsolationTmp", "gedGsfElectronsTmp")
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
iPSet.particleBasedIsolation = cms.InputTag("particleBasedIsolationTmp", "gedGsfElectronsTmp")
iPSet.particleBasedIsolation = "particleBasedIsolationTmp:gedGsfElectronsTmp"

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 9, 2020

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

@perrotta
Copy link
Contributor

perrotta commented Sep 9, 2020

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 9, 2020

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 9, 2020

+1
Tested at: c792051
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9fbfff/9222/summary.html
CMSSW: CMSSW_11_2_X_2020-09-08-2300
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 9, 2020

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 9, 2020

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9fbfff/9222/summary.html

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: 2609667
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2609644
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 34 files compared)
  • Checked 149 log files, 22 edm output root files, 35 DQM output files

@perrotta
Copy link
Contributor

perrotta commented Sep 9, 2020

+1

  • Dropped type specification for parameters in cloned configs, as planned
  • Jenkins tests pass

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 9, 2020

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

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

4 participants