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

backport of CASTOR updates on rechitcorrector and noise simulation #23894

Merged
merged 4 commits into from Sep 11, 2018

Conversation

hvanhaev
Copy link
Contributor

This is a back port of changes already included in the master, as discussed in PR: #22424

This contains a fix in the CASTOR noise simulation, and updates in the rechitcorrector module.
It would be good to have these too in CMSSW_80X for analyses with 2016 data.

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 20, 2018

A new Pull Request was created by @hvanhaev (Hans Van Haevermaet) for CMSSW_8_0_X.

It involves the following packages:

RecoLocalCalo/Castor
SimCalorimetry/CastorSim
SimGeneral/MixingModule

@perrotta, @cmsbuild, @civanch, @mdhildreth, @slava77 can you please review it and eventually sign? Thanks.
@makortel this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@fabiocos
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 20, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/29259/console Started: 2018/07/20 14:06

@fabiocos
Copy link
Contributor

@hvanhaev is this backport targeting a dedicated production of 2016 new simulation?

@hvanhaev
Copy link
Contributor Author

hvanhaev commented Jul 20, 2018 via email

@cmsbuild
Copy link
Contributor

@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-23894/29259/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 29 differences found in the comparisons
  • DQMHistoTests: Total files compared: 15
  • DQMHistoTests: Total histograms compared: 1038996
  • DQMHistoTests: Total failures: 1099
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1037799
  • DQMHistoTests: Total skipped: 98
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -14 KiB( 14 files compared)
  • Checked 61 log files, 7 edm output root files, 15 DQM output files

}
}

if (ok) {
CastorRecHit *correctedhit = new CastorRecHit(rechit.id(),correctedenergy,time);
rec->push_back(*correctedhit);
rec->emplace_back(rechit.id(),correctedenergy,time);
Copy link
Contributor

Choose a reason for hiding this comment

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

@hvanhaev , is it correct? I would think about "rec->emplace_back(new CastorRecHit(....))"

Copy link
Contributor

Choose a reason for hiding this comment

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

There is no need for new. One could think of explicitly calling a constructor emplace_back(CastorRecHit(..., but that's the same as what it is now.

the old implementation collected copies of the hits (type CastorRecHit). The updated version does exactly the same. and also avoids a memory leak that was there before.

Copy link
Contributor

Choose a reason for hiding this comment

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

No, using new here is totally unnecessary and in fact it's a memory leak. rec is a CastorRecHitCollection and it can construct the CastorRecHit objects from arguments using emplace_back().

@slava77
Copy link
Contributor

slava77 commented Jul 24, 2018

Reco comparison results: 29 differences found in the comparisons

there are changes in the default reconstruction in the castor energies etc. E.g. in ZMM workflow 1330.0.
This violates the nominal policy for production releases: default behavior should remain unchanged and if changed behavior is needed, it should be made available via a configuration change.

Given that this is 8_0 and it's CASTOR, perhaps an exception can be discussed. It would be nice to understand if there still can be a solution following the policy.

@civanch
Copy link
Contributor

civanch commented Jul 24, 2018

+1

@hvanhaev
Copy link
Contributor Author

hvanhaev commented Jul 24, 2018 via email

@slava77
Copy link
Contributor

slava77 commented Jul 26, 2018

backport of #22424

@cmsbuild
Copy link
Contributor

Pull request #23894 was updated. @perrotta, @cmsbuild, @civanch, @mdhildreth, @slava77 can you please check and sign again.

@perrotta
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 10, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/30311/console Started: 2018/09/10 10:16

@cmsbuild
Copy link
Contributor

@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-23894/30311/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 15
  • DQMHistoTests: Total histograms compared: 1038996
  • DQMHistoTests: Total failures: 1040
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1037858
  • DQMHistoTests: Total skipped: 98
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -14 KiB( 14 files compared)
  • Checked 61 log files, 7 edm output root files, 15 DQM output files

@perrotta
Copy link
Contributor

+1

  • Correct backport of the code needed to apply fixes for the analysis and reprocessings of Castor data, which do not change the previous behaviour in its default configuration: the last addition since previous reco signature just reinforced it.

@fabiocos
Copy link
Contributor

+1

@fabiocos
Copy link
Contributor

fabiocos commented Sep 11, 2018

merge

@civanch you already signed this PR, the further change just keeps the default behaviour, in case please sign it again anyway

@cmsbuild cmsbuild merged commit 2c691cc into cms-sw:CMSSW_8_0_X Sep 11, 2018
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