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

Move PFClusterWidthAlgo into CommonTools/ParticleFlow #33458

Merged
merged 3 commits into from Apr 22, 2021
Merged

Move PFClusterWidthAlgo into CommonTools/ParticleFlow #33458

merged 3 commits into from Apr 22, 2021

Conversation

guitargeek
Copy link
Contributor

PR description:

This PR moves PFClusterWidthAlgo from RecoParticleFlow/PFClusterTools to CommonTools/ParticleFlow. That class is used both in RecoEgamma and RecoEcal as well, justifying the transition to CommonTools. Like this, the dependency of RecoEgamma on RecoParticleFlow is eliminated.

Furthermore, the includes in HGCalShowerShapeHelper are cleaned to make it not appear like RecoEgamma/EgammaTools depends on RecoParticleFlow.

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

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33458/22156

  • This PR adds an extra 68KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

CommonTools/ParticleFlow
RecoEcal/EgammaClusterAlgos
RecoEgamma/EgammaElectronProducers
RecoEgamma/EgammaTools
RecoParticleFlow/PFProducer

@perrotta, @jpata, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@rappoccio, @jainshilpi, @argiro, @thomreis, @varuns23, @seemasharmafnal, @mmarionncern, @ahinzmann, @lgray, @jdolen, @simonepigazzini, @Sam-Harper, @cbernet, @rovere, @gkasieczka, @hatakeyamak, @clelange, @rchatter, @sobhatta, @lecriste, @afiqaize, @ram1123 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 Apr 18, 2021

@cmsbuild please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: Build
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-1d0c22/14303/summary.html
COMMIT: 45f5bec
CMSSW: CMSSW_12_0_X_2021-04-18-0000/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/33458/14303/install.sh to create a dev area with all the needed externals and cmssw changes.

Build

I found compilation error when building:

>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-04-18-0000/src/RecoEcal/EgammaClusterProducers/src/ReducedRecHitCollectionProducer.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-04-18-0000/src/RecoEcal/EgammaClusterProducers/src/SCEnergyCorrectorProducer.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-04-18-0000/src/RecoEcal/EgammaClusterProducers/src/SealModule.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-04-18-0000/src/RecoEcal/EgammaClusterProducers/src/UncleanSCRecoveryProducer.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-04-18-0000/src/RecoEcal/EgammaClusterProducers/src/UnifiedSCCollectionProducer.cc
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-04-18-0000/src/RecoEcal/EgammaClusterProducers/src/SCEnergyCorrectorProducer.cc:28:32: error: 'SuperClusterCollection' is not a member of 'reco'; did you mean 'CaloClusterCollection'?
   28 |   const edm::EDGetTokenT inputSCToken_;
      |                                ^~~~~~~~~~~~~~~~~~~~~~
      |                                CaloClusterCollection
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_0_X_2021-04-18-0000/src/RecoEcal/EgammaClusterProducers/src/SCEnergyCorrectorProducer.cc:28:54: error: template argument 1 is invalid
   28 |   const edm::EDGetTokenT inputSCToken_;


@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33458/22157

  • This PR adds an extra 12KB to repository

@cmsbuild
Copy link
Contributor

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

@slava77
Copy link
Contributor

slava77 commented Apr 18, 2021

@cmsbuild please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-1d0c22/14305/summary.html
COMMIT: dbaf8b4
CMSSW: CMSSW_12_0_X_2021-04-18-0000/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/33458/14305/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: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 38
  • DQMHistoTests: Total histograms compared: 2877046
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2877017
  • 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

@slava77
Copy link
Contributor

slava77 commented Apr 22, 2021

+reconstruction

for #33458 dbaf8b4

  • code changes are in line with the PR description, moving PFClusterWidthAlgo
  • jenkins tests pass and comparisons with the baseline show no (relevant) differences

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

@qliphy
Copy link
Contributor

qliphy commented Apr 22, 2021

+1

@cmsbuild cmsbuild merged commit b4bb14f into cms-sw:master Apr 22, 2021
@guitargeek guitargeek deleted the RecoEgamma_RecoParticleFlow_1 branch April 22, 2021 15:13
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