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

Cleanup of the PFTrack class #31151

Merged
merged 3 commits into from Aug 18, 2020
Merged

Conversation

hatakeyamak
Copy link
Contributor

@hatakeyamak hatakeyamak commented Aug 15, 2020

PR description:

Removing an obsolete "color" data member from the PFTrack class. This is triggered by #31149 done for the PFCluster class. We also used this opportunity to remove calculatePositionREP for PFTrack as it has not been doing anything.

PR validation:

Compiles. And, checked with the matrix test 11634.0 (ttbar 2021).

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

This is not a backport.

@bendavid

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31151/17773

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @hatakeyamak (Kenichi Hatakeyama) for master.

It involves the following packages:

DataFormats/ParticleFlowReco

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

@hatakeyamak
Copy link
Contributor Author

Looks like there is more room for cleanup. Will look into it.

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@hatakeyamak
Copy link
Contributor Author

Looks like there is more room for cleanup. Will look into it.

Done from my point of view.

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31151/17776

@cmsbuild
Copy link
Contributor

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

@slava77
Copy link
Contributor

slava77 commented Aug 16, 2020

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 16, 2020

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

+1
Tested at: 8e55e57
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-2aa2b3/8774/summary.html
CMSSW: CMSSW_11_2_X_2020-08-15-1100
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-2aa2b3/8774/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 35
  • DQMHistoTests: Total histograms compared: 2608246
  • DQMHistoTests: Total failures: 5
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2608192
  • DQMHistoTests: Total skipped: 48
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.004 KiB( 34 files compared)
  • DQMHistoSizes: changed ( 10224.0 ): 0.004 KiB MessageLogger/Warnings
  • Checked 149 log files, 22 edm output root files, 35 DQM output files

@@ -97,7 +98,8 @@
<class name="edm::Wrapper<std::vector<reco::PFTrajectoryPoint> >"/>

<class name="edm::RefVector<std::vector<reco::PFBlock>,reco::PFBlock,edm::refhelper::FindUsingAdvance<std::vector<reco::PFBlock>,reco::PFBlock> >"/>
<class name="reco::PFRecTrack" ClassVersion="12">
<class name="reco::PFRecTrack" ClassVersion="13">
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the commented-out color field a few lines below can also be removed from this dictionary and others.

Furthermore, in https://github.com/cms-sw/cmssw/pull/31149/files/515b760240b0c70982aba7da77fde628c278bbd7#r471527409 it was noticed that the removal of a transient data member would not require a new class version. However, my understanding is that there's no harm in it either, as ROOT's schema evolution allows us to still read old versions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think this update was necessary. It may be because the "transient="true"" line was commented out.
If we remove the already-commented out color_ line, we should also remove doPropagation_ line which is not used anywhere afaik?

Copy link
Contributor

Choose a reason for hiding this comment

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

I see, thanks for the clarification. I think it's good to remove the commented-out lines in the xml, and keep the new class version as you have defined.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can. At this point when this PR is already merged, what is the most efficient way?

Copy link
Contributor

Choose a reason for hiding this comment

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

We can keep it for another PR that cleans up class xmls in PF packages, for example. It's not urgent.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good.

@jpata
Copy link
Contributor

jpata commented Aug 18, 2020

@hatakeyamak I had just a minor comment inline. Could you also update the PR description to mention the removal of the calculatePositionREP method?

It doesn't seem like there is any reco effect from this change, anyhow, also it doesn't seem to be used in Fireworks, so it should be fine.

@hatakeyamak
Copy link
Contributor Author

@hatakeyamak I had just a minor comment inline. Could you also update the PR description to mention the removal of the calculatePositionREP method?

It doesn't seem like there is any reco effect from this change, anyhow, also it doesn't seem to be used in Fireworks, so it should be fine.

Thanks. Done.

@jpata
Copy link
Contributor

jpata commented Aug 18, 2020

+1

  • tests pass with no changes to reco outputs, as expected
  • change is purely technical, removing unused code (PFTrack::color and PFTrack::calculatePositionREP)
  • a new class version of PFTrack and derived classes PFRecTrack, GsfPFRecTrack, PFBrem, PFSimParticle has been created
  • description is in line with the changes

@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 Aug 18, 2020

+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