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

Modernized AlcaBeamMonitor #31354

Merged
merged 5 commits into from Sep 9, 2020
Merged

Conversation

Dr15Jones
Copy link
Contributor

PR description:

  • Avoid segmentation fault when a job has no LuminosityBlocks
  • Added fillDescriptions
  • Added esConsumes call

PR validation:

Code compiles and the new unit test passes.

This avoids a segmentation fault under that condition.
Test case where no LuminosityBlocks are processed. Before fix,
this would lead to segmentation faults.
- added esConsumes
- removed unused parameter BeamSpotLabel
@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2020

The code-checks are being triggered in jenkins.

@Dr15Jones
Copy link
Contributor Author

@smuzaffar @makortel this should fix the seg faults seen in the ASAN IBs.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2020

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-31354/18137

  • This PR adds an extra 40KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2020

A new Pull Request was created by @Dr15Jones (Chris Jones) for master.

It involves the following packages:

DQM/BeamMonitor
RecoVertex/BeamSpotProducer

@perrotta, @andrius-k, @kmaeshima, @slava77, @christopheralanwest, @tocheng, @cmsbuild, @jfernan2, @fioriNTU, @tlampen, @jpata, @pohsun can you please review it and eventually sign? Thanks.
@makortel, @GiacomoSguazzoni, @JanFSchulte, @rovere, @VinInn, @ebrondol, @tocheng, @mmusich, @mtosi, @dgulhan 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

@Dr15Jones
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2020

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2020

+1
Tested at: d74ce46
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b1948b/9102/summary.html
CMSSW: CMSSW_11_2_X_2020-09-03-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-b1948b/9102/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b1948b/9102/git-merge-result

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2020

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2020

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 35
  • DQMHistoTests: Total histograms compared: 2609667
  • DQMHistoTests: Total failures: 488
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2609156
  • DQMHistoTests: Total skipped: 22
  • 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

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 5, 2020

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 6, 2020

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b1948b/9152/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

@Dr15Jones
Copy link
Contributor Author

Just a reminder, this will avoid the 350 segmentation faults seen in the ASAN IB.


beamFitter.addUntracked<bool>("Debug");
beamFitter.addUntracked<edm::InputTag>("TrackCollection");
iDesc.addUntracked<edm::InputTag>("primaryVertex", edm::InputTag("offlinePrimaryVertices"));
Copy link
Contributor

Choose a reason for hiding this comment

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

If the default values for these parameters are defined here, would it make sense to remove them from the constructor:

iConfig.getUntrackedParameter<edm::InputTag>("primaryVertex", edm::InputTag("offlinePrimaryVertices")));
?

Copy link
Contributor

Choose a reason for hiding this comment

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

It seems like the main python definition of BeamFitter is here [1] (with some alternate defitions in neighboring files) - do we want to reduce the duplication of the default parameters somewhat between the fillDescriptions and the cff?

[1]

BeamFitter = cms.PSet(

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’d prefer to have that done in a separate pull request so we can get the bug fix in.

@jfernan2
Copy link
Contributor

jfernan2 commented Sep 9, 2020

+1

@Dr15Jones
Copy link
Contributor Author

type bug

@jpata
Copy link
Contributor

jpata commented Sep 9, 2020

@Dr15Jones what do you mean by the type bug?

@Dr15Jones
Copy link
Contributor Author

@jpata

what do you mean by the type bug?

This pull request gets marked as a bug fix. Right now we are getting segmentation faults in the ASAN IB. This pull request fixes that. (I admit I did more than the bare minimum to fix the bug).

trackLabel_(consumes<reco::TrackCollection>(parameters_.getUntrackedParameter<InputTag>("TrackLabel"))),
scalerLabel_(consumes<BeamSpot>(parameters_.getUntrackedParameter<InputTag>("ScalerLabel"))),
beamSpotLabel_(parameters_.getUntrackedParameter<InputTag>("BeamSpotLabel")),
: monitorName_(ps.getUntrackedParameter<string>("MonitorName")),
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you explain why you have removed the second parameter "YourSubsystemName" here but not in AlcaBeamMonitor::fillDescriptions?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Having it in both the getUntrackedParameter call and in fillDescriptions would be redundant. If the parameter is missing, the fillDescriptions call will inject the "MonitorName" string parameter into the module's PSet using the default "YourSubsystemName". Therefore during the constructor call the parameter "MonitorName" is guaranteed to exist so no default value is needed for the getUntrackedParameter. So the change I made has exactly the same ultimate behavior as the original code.

In general, the framework group highly encourages everyone to stop specifying default values in getUntrackedParameter and instead use fillDescriptions.

@jpata
Copy link
Contributor

jpata commented Sep 9, 2020

+reconstruction

  • fixes a bug in AlcaBeamMonitor in case of no LuminosityBlocks
  • also moves parameters to fillDescriptions
  • some residual cleanup with respect to the python config would be good as a follow-up
  • no reco changes expected or observed

@christopheralanwest
Copy link
Contributor

+alca

@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

@cmsbuild cmsbuild merged commit 8ecfc3e into cms-sw:master Sep 9, 2020
@Dr15Jones Dr15Jones deleted the fixAlcaBeamMonitor branch October 14, 2020 19:43
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

7 participants