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

Add rhoCorr and energy-binned cuts #18559

Merged
merged 11 commits into from May 9, 2017
Merged

Conversation

afiqaize
Copy link
Contributor

@afiqaize afiqaize commented May 3, 2017

[Take 2 of the closed #18558]

This PR adds 2 new features to the affected filters:
1 - ability to do rho correction on the variable being cut on, so that this can be applied at filter level instead of producer level as is done now
2 - energy or Et dependent cut thresholds for e.g. looser dPhi cut at low Et

The customization function provided modifies the affected filters such that they're compatible with this PR but with no change in behavior at all.

Cheers,
Afiq

@cmsbuild
Copy link
Contributor

cmsbuild commented May 3, 2017

A new Pull Request was created by @afiqaize (Afiq Anuar) for master.

It involves the following packages:

HLTrigger/Egamma

@Martin-Grunewald, @silviodonato, @cmsbuild, @fwyzard, @davidlange6 can you please review it and eventually sign? Thanks.
@Martin-Grunewald this is something you requested to watch as well.
@davidlange6 you are the release manager for this.

cms-bot commands are listed here

@Martin-Grunewald
Copy link
Contributor

Martin-Grunewald commented May 4, 2017

This looks the wrong strategy:
You need to modify several/all filters, with duplicated code, as opposed to just adding it to a single/few producers, or write a new producer which takes the collection and slims it accordingly.

@afiqaize
Copy link
Contributor Author

afiqaize commented May 4, 2017

The idea is to have these capabilities with as little migration work as possible, given the timescale we have - there are just many HLTEgammaGenericFilters in the menu. I'm not sure I understand the last part about the producer - currently all the relevant producers also have the same bit of duplicate code - so this is just a matter of shifting where this correction is done (without creating another collection, not sure if this would be cheaper).

What do you think is a more efficient migration strategy?

@cmsbuild
Copy link
Contributor

cmsbuild commented May 4, 2017

Pull request #18559 was updated. @Martin-Grunewald, @silviodonato, @cmsbuild, @fwyzard, @davidlange6 can you please check and sign again.

@Martin-Grunewald
Copy link
Contributor

Code duplication is never a good idea.
Also, how many different working points to you foresee?
It should be restricted to a very few (for ease of efficiency / bg and rate calculations), and then it is
better to put those into the collection producer, rather than allow each and every filter instance used in the menu to do things differently.

@afiqaize
Copy link
Contributor Author

afiqaize commented May 4, 2017

For the upcoming single ele retuning we foresee 2 working points; Loose and Tight.

Let me try to clarify the motivation behind this PR. Currently, we have 2 seeded H/E producers in the menu: with and without rhoCorr. The latter one serves only the single electron paths. As to apply rhoCorr is part of a WP, with this PR we can have only single ele WPs apply the rhoCorr on H/E and others don't, without branching off on the producer, which we think is the more consistent approach (and less chance for definition-affecting desync).

Similarly, last year with our effArea updates we more or less "forced" other WPs to adopt them, due to not wanting to branch off the isolation producers.

If this PR is accepted, the plan is to:
1- Converge back on the H/E producer mentioned above
2- Turn off the corrections at producer level and on at filter level for Ecal and Hcal isolations
3- The retuned single ele WPs can then be applied without affecting any other WPs whatsoever

@smuzaffar smuzaffar modified the milestones: CMSSW_9_2_X, CMSSW_9_1_X May 4, 2017
double cutOverE2EB2_ = 9999., cutOverE2EE2_ = 9999.;

int iEn = -1;
for (int dIt = energyLowEdges_.size() - 1; dIt > -1; dIt--) {
Copy link
Contributor

Choose a reason for hiding this comment

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

please consider replacing this loop with something like std::lower_bound or std::upper_bound(energyLowEdges_.begin(), energyLowEdges_.end(), energy)


int iEn = -1;
for (int dIt = energyLowEdges_.size() - 1; dIt > -1; dIt--) {
if ( energy >= energyLowEdges_.at(dIt) ) {
Copy link
Contributor

Choose a reason for hiding this comment

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

please consider replacing this loop with something like std::lower_bound or std::upper_bound(energyLowEdges_.begin(), energyLowEdges_.end(), energy)

double cutOverE2EB_ = 9999., cutOverE2EE_ = 9999.;

int iEn = -1;
for (int dIt = energyLowEdges_.size() - 1; dIt > -1; dIt--) {
Copy link
Contributor

Choose a reason for hiding this comment

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

please consider replacing this loop with something like std::lower_bound or std::upper_bound(energyLowEdges_.begin(), energyLowEdges_.end(), energy)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right, thanks for pointing it out.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 4, 2017

Pull request #18559 was updated. @Martin-Grunewald, @silviodonato, @cmsbuild, @fwyzard, @davidlange6 can you please check and sign again.

@Martin-Grunewald
Copy link
Contributor

This PR has now become a 92X PR - please make a PR for 91X as well.

@Martin-Grunewald
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/19582/console Started: 2017/05/05 08:23

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2017

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2017

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 5, 2017

Pull request #18559 was updated. @Martin-Grunewald, @silviodonato, @cmsbuild, @fwyzard, @davidlange6 can you please check and sign again.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 9, 2017

Pull request #18559 was updated. @Martin-Grunewald, @silviodonato, @cmsbuild, @fwyzard, @davidlange6 can you please check and sign again.

@cmsbuild
Copy link
Contributor

cmsbuild commented May 9, 2017

Pull request #18559 was updated. @Martin-Grunewald, @silviodonato, @cmsbuild, @fwyzard, @davidlange6 can you please check and sign again.

@Martin-Grunewald
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 9, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/19664/console Started: 2017/05/09 10:27

@cmsbuild
Copy link
Contributor

cmsbuild commented May 9, 2017

Comparison job queued.

@Martin-Grunewald
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented May 9, 2017

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 requires discussion in the ORP meeting before it's merged. @davidlange6, @smuzaffar

@cmsbuild
Copy link
Contributor

cmsbuild commented May 9, 2017

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

Comparison Summary:

  • You potentially added 27541 lines to the logs
  • Reco comparison results: 3472 differences found in the comparisons
  • DQMHistoTests: Total files compared: 24
  • DQMHistoTests: Total histograms compared: 1831016
  • DQMHistoTests: Total failures: 49767
  • DQMHistoTests: Total nulls: 428
  • DQMHistoTests: Total successes: 1780641
  • DQMHistoTests: Total skipped: 180
  • DQMHistoTests: Total Missing objects: 0
  • Checked 98 log files, 14 edm output root files, 24 DQM output files

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit a1093e6 into cms-sw:master May 9, 2017
@afiqaize afiqaize deleted the egmFilt91X branch May 9, 2017 17: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

6 participants