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

Migrate 17 EDFilters in GenFilters from legacy #29048

Merged
merged 1 commit into from
Feb 28, 2020

Conversation

wddgit
Copy link
Contributor

@wddgit wddgit commented Feb 26, 2020

PR description:

17 more legacy EDFilters in the GenFilters package
migrated from being legacy types to global, stream,
or one types. This is the third in a series of such
PRs. It is possibly the last because the ones that
have not been migrated yet have been broken for years
and probably are not worth the effort to migrate.

There is a considerable amount of cleanup mixed in with
this. Headers fixed, commented code removed, cout lines
removed, event counters removed, .h content moved to
.cc files, destructors just defaulted, esConsumes migration
done...

The intent is nothing has been done that would change
the filter behavior and in fact the changes to the
algorithmic code in the filter methods are very small.
I didn't touch any complicated logical code.

PR validation:

Relying on existing tests. Behavior should not change.

@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-29048/13914

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @wddgit (W. David Dagenhart) for master.

It involves the following packages:

GeneratorInterface/GenFilters

@SiewYan, @efeyazgan, @mkirsano, @cmsbuild, @agrohsje, @alberto-sanchez, @qliphy can you please review it and eventually sign? Thanks.
@alberto-sanchez, @agrohsje, @mkirsano this is something you requested to watch as well.
@davidlange6, @silviodonato, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@wddgit
Copy link
Contributor Author

wddgit commented Feb 26, 2020

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 26, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4899/console Started: 2020/02/26 18:54

@cmsbuild
Copy link
Contributor

+1
Tested at: a60b6a1
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d25968/4899/summary.html
CMSSW: CMSSW_11_1_X_2020-02-25-2300
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-d25968/4899/summary.html

@slava77 comparisons for the following workflows were not done due to missing matrix map:

  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-d25968/11634.0_TTbar_14TeV+TTbar_14TeV_TuneCP5_2021_GenSimFull+DigiFull_2021+RecoFull_2021+HARVESTFull_2021+ALCAFull_2021
  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-d25968/12434.0_TTbar_14TeV+TTbar_14TeV_TuneCP5_2023_GenSimFull+DigiFull_2023+RecoFull_2023+HARVESTFull_2023+ALCAFull_2023
  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-d25968/20034.0_TTbar_14TeV+TTbar_14TeV_TuneCP5_2026D35_GenSimHLBeamSpotFull14+DigiFullTrigger_2026D35+RecoFullGlobal_2026D35+HARVESTFullGlobal_2026D35
  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-d25968/20434.0_TTbar_14TeV+TTbar_14TeV_TuneCP5_2026D41_GenSimHLBeamSpotFull14+DigiFullTrigger_2026D41+RecoFullGlobal_2026D41+HARVESTFullGlobal_2026D41
  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-d25968/21234.0_TTbar_14TeV+TTbar_14TeV_TuneCP5_2026D44_GenSimHLBeamSpotFull14+DigiFullTrigger_2026D44+RecoFullGlobal_2026D44+HARVESTFullGlobal_2026D44
  • /data/cmsbld/jenkins/workspace/compare-root-files-short-matrix/data/PR-d25968/23234.0_TTbar_14TeV+TTbar_14TeV_TuneCP5_2026D49_GenSimHLBeamSpotFull14+DigiFullTrigger_2026D49+RecoFullGlobal_2026D49+HARVESTFullGlobal_2026D49

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2679706
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2679386
  • DQMHistoTests: Total skipped: 319
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
  • Checked 147 log files, 16 edm output root files, 34 DQM output files

@qliphy
Copy link
Contributor

qliphy commented Feb 27, 2020

+1

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

@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-29048/13933

  • This PR adds an extra 44KB to repository

@wddgit
Copy link
Contributor Author

wddgit commented Feb 27, 2020

please test

rebase to fix trivial conflict, twice this PR deleted a line adjacent to a line deleted by the earlier PR in the SealModule.cc file. We want both lines deleted. Nothing else changed in the PR.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 27, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4919/console Started: 2020/02/27 17:26

@cmsbuild
Copy link
Contributor

Pull request #29048 was updated. @SiewYan, @efeyazgan, @mkirsano, @cmsbuild, @agrohsje, @alberto-sanchez, @qliphy can you please check and sign again.

@cmsbuild
Copy link
Contributor

+1
Tested at: 910ae2e
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d25968/4919/summary.html
CMSSW: CMSSW_11_1_X_2020-02-27-1100
SCRAM_ARCH: slc7_amd64_gcc820

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d25968/4919/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d25968/4919/git-merge-result

@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-d25968/4919/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2679706
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2679386
  • DQMHistoTests: Total skipped: 319
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
  • Checked 147 log files, 16 edm output root files, 34 DQM output files

@wddgit
Copy link
Contributor Author

wddgit commented Feb 28, 2020

There really was no change at all to this PR since it was approved. I just had to resolve a conflict because this PR deleted a line adjacent to a line the other recently merged PR deleted (in SealModule.cc). But it needs a new +1.

@agrohsje
Copy link

+1

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

@silviodonato
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 4dc16a0 into cms-sw:master Feb 28, 2020
@wddgit wddgit deleted the convertLegacyFilters3 branch July 17, 2020 15:16
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