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

Small miniAOD improvements #20367

Merged
merged 6 commits into from Sep 8, 2017
Merged

Small miniAOD improvements #20367

merged 6 commits into from Sep 8, 2017

Conversation

gpetruc
Copy link
Contributor

@gpetruc gpetruc commented Sep 4, 2017

  • add a missing const in the miniPFIsolation method declaration
  • save dz(PV) into the pat Electron & Muon for convenience of applying it downstream without a PV object, e.g. via string-based selectors (we already do that dxy(PV) and ip3d(PV))
  • add non-templated reduceMantissaToNbits methods with rounding

will push the code-checks to this branch later (to not obscure the content of the PR)

@arizzi @peruzzim @emanueledimarco

@slava77
Copy link
Contributor

slava77 commented Sep 4, 2017

@smuzaffar
has the bot fallen asleep?
It's been 20 mins since the PR was submitted and the bot did not register it yet.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2017

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2017

A new Pull Request was created by @gpetruc (Giovanni Petrucciani) for master.

It involves the following packages:

DataFormats/PatCandidates
PhysicsTools/PatAlgos

@perrotta, @cmsbuild, @monttj, @slava77 can you please review it and eventually sign? Thanks.
@TaiSakuma, @gouskos, @imarches, @ahinzmann, @acaudron, @mmarionncern, @rappoccio, @jdolen, @nhanvtran, @JyothsnaKomaragiri, @gkasieczka, @schoef, @ferencek, @mverzett, @mariadalfonso, @pvmulder, @seemasharmafnal, @cbernet this is something you requested to watch as well.
@davidlange6, @slava77 you are the release manager for this.

cms-bot commands are listed here

@perrotta
Copy link
Contributor

perrotta commented Sep 4, 2017

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/22690/console Started: 2017/09/04 15:23

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2017

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-20367/485

Code check has found code style and quality issues which could be resolved by applying a patch in https://cmssdt.cern.ch/SDT/code-checks/PR-20367/485/git-diff.patch
e.g. curl https://cmssdt.cern.ch/SDT/code-checks/PR-20367/485/git-diff.patch | patch -p1

You can run scram build code-checks to apply code checks directly (this will soon be required for PRs to be considered)

class ReduceMantissaToNbitsRounding {
public:
ReduceMantissaToNbitsRounding(int bits) :
shift(23-bits), mask((0xFFFFFFFF >> (shift)) << (shift)),
Copy link
Contributor

Choose a reason for hiding this comment

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

it looks like this duplicates the functionality of inline static float reduceMantissaToNbitsRounding(const float &f)
please remove the other implementation or see how the code duplication can be reduced

Copy link
Contributor Author

Choose a reason for hiding this comment

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

is the solution in 9f31d22 ok for you?

Copy link
Contributor

Choose a reason for hiding this comment

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

yes, it looks OK.
Thank you.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2017

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2017

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

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2017

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-20367/488

Code check has found code style and quality issues which could be resolved by applying a patch in https://cmssdt.cern.ch/SDT/code-checks/PR-20367/488/git-diff.patch
e.g. curl https://cmssdt.cern.ch/SDT/code-checks/PR-20367/488/git-diff.patch | patch -p1

You can run scram build code-checks to apply code checks directly (this will soon be required for PRs to be considered)

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 6, 2017

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 6, 2017

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

@slava77
Copy link
Contributor

slava77 commented Sep 6, 2017

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 6, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/22757/console Started: 2017/09/06 18:15

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 6, 2017

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-20367/534

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 6, 2017

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 6, 2017

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 6, 2017

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 26
  • DQMHistoTests: Total histograms compared: 2656498
  • DQMHistoTests: Total failures: 208
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2656101
  • DQMHistoTests: Total skipped: 189
  • DQMHistoTests: Total Missing objects: 0
  • Checked 107 log files, 14 edm output root files, 26 DQM output files

@@ -193,7 +193,7 @@ namespace pat {
void hcalIsoDeposit(const IsoDeposit &dep) { setIsoDeposit(pat::HcalIso, dep); }
void userIsoDeposit(const IsoDeposit &dep, uint8_t index=0) { setIsoDeposit(IsolationKeys(UserBaseIso + index), dep); }

const PFIsolation& miniPFIsolation() { return miniPFIsolation_; }
const PFIsolation& miniPFIsolation() const { return miniPFIsolation_; }
Copy link
Contributor

Choose a reason for hiding this comment

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

please make a backport for this part to 93X and 92X.

@gpetruc
Copy link
Contributor Author

gpetruc commented Sep 7, 2017 via email

@slava77
Copy link
Contributor

slava77 commented Sep 7, 2017

+1

for #20367 d5d893e

  • changes are as described; one float is added to pat electrons and muons, other changes are somewhat more technical.
  • jenkins tests pass and comparisons with baseline show no differences

@davidlange6
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit 9617bdf into cms-sw:master Sep 8, 2017
gpetruc added a commit to gpetruc/NanoAOD that referenced this pull request Sep 13, 2017
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

6 participants