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

Update event content structure in RecoEcal and RecoVertex #29299

Merged
merged 2 commits into from
Apr 21, 2020

Conversation

jeongeun
Copy link
Contributor

@jeongeun jeongeun commented Mar 25, 2020

PR description:

Update event content definitions to explicitly have RECO to be a superset of AOD and for FEVT to be a superset of RECO. Clean up 'drop' not really used in RecoEcalRECO.
(The previous tasks are PR#29025, PR#29158, and PR#29225.)
3 files changed :
+RecoEcal_EventContent_cff.py
+RecoVertex_EventContent_cff.py
+BeamSpot_EventContent_cff.py

PR validation:

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

@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-29299/14363

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

RecoEcal/Configuration
RecoVertex/BeamSpotProducer
RecoVertex/Configuration

@perrotta, @slava77, @christopheralanwest, @tocheng, @cmsbuild, @tlampen, @pohsun can you please review it and eventually sign? Thanks.
@varuns23, @Sam-Harper, @makortel, @jainshilpi, @afiqaize, @GiacomoSguazzoni, @tocheng, @lgray, @sobhatta, @rovere, @VinInn, @ebrondol, @argiro, @mmusich, @dgulhan 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

@perrotta
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 25, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/5375/console Started: 2020/03/25 14:30

@cmsbuild
Copy link
Contributor

+1
Tested at: 14ed839
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-61785f/5375/summary.html
CMSSW: CMSSW_11_1_X_2020-03-25-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-61785f/5375/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2692110
  • DQMHistoTests: Total failures: 38
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2691753
  • 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

@pohsun
Copy link

pohsun commented Mar 28, 2020

+1

Copy link
Contributor

@perrotta perrotta left a comment

Choose a reason for hiding this comment

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

These are all the comments I have for this PR

'keep recoSuperClusters_correctedHybridSuperClusters_*_*',
# Endcap clusters
'keep *_multi5x5SuperClusters_*_*',
'keep recoSuperClusters_multi5x5SuperClusters_*_*',
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a subset of the line above... But ok, it doesn't hurt

# Particle Flow superclusters
'keep *_particleFlowSuperClusterECAL_*_*',
'keep *_particleFlowSuperClusterOOTECAL_*_*',
# DROP statements # not used
Copy link
Contributor

Choose a reason for hiding this comment

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

How did you verify that these drop statements are not used?
@afiqaize @SohamBhattacharya

Copy link
Contributor Author

Choose a reason for hiding this comment

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

By my event content comparison check, these drop statements don't really act on the RECO/FEVT event content. When I checked every event content without these drop statements like this modified file, there is no difference in event contents.
@afiqaize @SohamBhattacharya Please confirm if these 4 drop statements can be removed.

Copy link
Contributor Author

@jeongeun jeongeun Apr 20, 2020

Choose a reason for hiding this comment

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

For now, it would be good to have these drop statements in RecoEcalRECO PSets as the original. I'll not remove them. It will safe in the new commit.

# Barrel clusters
'keep *_correctedHybridSuperClusters_*_*',
# Endcap clusters
'keep *_multi5x5*_*_*',
Copy link
Contributor

Choose a reason for hiding this comment

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

Can this get expanded without the wild card (and without blowing the list too much)?

Copy link
Contributor

Choose a reason for hiding this comment

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

If this is in FEVT, I think that an exception can be made, considering that this datatier is more debug-like than something for sustained production

Copy link
Contributor Author

@jeongeun jeongeun Apr 7, 2020

Choose a reason for hiding this comment

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

I've found 5 modules in RECO/FEVT event contents :
multi5x5BasicClustersCleaned
multi5x5SuperClusters
multi5x5SuperClustersCleaned
multi5x5SuperClustersWithPreshower
multi5x5PreshowerClusterShape

with different types and labels.

vector<reco::CaloCluster> multi5x5BasicClustersCleaned * *
vector<reco::SuperCluster> multi5x5BasicClustersCleaned * *
vector<reco::CaloCluster> multi5x5SuperClusters * *
vector<reco::SuperCluster> multi5x5SuperClusters * *
vector<reco::PreshowerCluster> multi5x5SuperClustersWithPreshower * *
vector<reco::SuperCluster>  multi5x5SuperClustersWithPreshower * *
vector<reco::PreshowerClusterShape> multi5x5PreshowerClusterShape * *

'keep *_correctedHybridSuperClusters_*_*',
# Endcap clusters
'keep *_multi5x5*_*_*',
'keep *_correctedMulti5x5*_*_*')
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there anything else beside correctedMulti5x5SuperClustersWithPreshower already saved in the AOD event content?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, only vector<reco::SuperCluster> "correctedMulti5x5SuperClustersWithPreshower" "" "RECO" exists in AOD event content (also in RECO/FEVT event contents). So this line is redundant so it can be deleted.

@cmsbuild
Copy link
Contributor

Pull request #29299 was updated. @perrotta, @slava77, @christopheralanwest, @tocheng, @cmsbuild, @tlampen, @pohsun can you please check and sign again.

@perrotta
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 20, 2020

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/5787/console Started: 2020/04/20 17:20

@cmsbuild
Copy link
Contributor

+1
Tested at: c960422
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-61785f/5787/summary.html
CMSSW: CMSSW_11_1_X_2020-04-20-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-61785f/5787/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2696435
  • DQMHistoTests: Total failures: 2
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2696114
  • 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

@perrotta
Copy link
Contributor

+1

  • EventContent structure updated as planned, without changing the list of saved products in AOD/RECO/FEVT outputs
  • Jenkins tests pass and show no differences

@pohsun
Copy link

pohsun commented Apr 21, 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. @silviodonato, @dpiparo (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.

6 participants