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 of PointSeededTrackingRegionsProducer to work in CMSSW 9 #18817

Merged
merged 7 commits into from May 24, 2017
Merged

Update of PointSeededTrackingRegionsProducer to work in CMSSW 9 #18817

merged 7 commits into from May 24, 2017

Conversation

JanFSchulte
Copy link
Contributor

The PointSeededTrackingRegionsProducer.h is updated with a correct fillDescription method to work in CMSSW 91X. Also, the possibility of using multiple eta-phi points to seed regions is added. Need for mitigation of the effect of non-functioning modules in the new pixel detector at HLT.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @JanFSchulte (Jan-Frederik Schulte) for master.

It involves the following packages:

RecoTracker/TkTrackingRegions

@perrotta, @cmsbuild, @slava77, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig, @makortel, @felicepantaleo, @GiacomoSguazzoni, @rovere, @VinInn, @mschrode, @gpetruc, @ebrondol, @dgulhan this is something you requested to watch as well.
@davidlange6 you are the release manager for this.

cms-bot commands are listed here

@slava77
Copy link
Contributor

slava77 commented May 17, 2017

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 17, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/19949/console Started: 2017/05/18 00:04

@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-18817/19949/summary.html

Comparison Summary:

  • You potentially added 26 lines to the logs
  • Reco comparison results: 1672 differences found in the comparisons
  • DQMHistoTests: Total files compared: 24
  • DQMHistoTests: Total histograms compared: 1833901
  • DQMHistoTests: Total failures: 53544
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1780177
  • DQMHistoTests: Total skipped: 180
  • DQMHistoTests: Total Missing objects: 0
  • Checked 98 log files, 14 edm output root files, 24 DQM output files

@perrotta
Copy link
Contributor

+1
PointSeededTrackingRegionsProducer.h is updated with a fillDescription method
No changes expected and no changes observed in outputs

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

int m_maxNVertices;

std::vector<edm::ParameterSet> points;
Copy link
Contributor

Choose a reason for hiding this comment

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

hi @JanFSchulte - please store a vector of eta and phi values instead of the ParameterSets. This will avoid many string comparisons (and save space)

@cmsbuild
Copy link
Contributor

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

@@ -68,7 +68,8 @@ class PointSeededTrackingRegionsProducer : public TrackingRegionProducer
edm::ParameterSet points = regPSet.getParameter<edm::ParameterSet>("points");
etaPoints = points.getParameter<std::vector<double>>("eta");
phiPoints = points.getParameter<std::vector<double>>("phi");
if (!(etaPoints.size() == phiPoints.size())) edm::LogError ("PointSeededTrackingRegionsProducer")<<"same number of eta and phi coordinates must be specified";
//if (!(etaPoints.size() == phiPoints.size())) edm::Exception ("PointSeededTrackingRegionsProducer")<<"same number of eta and phi coordinates must be specified";
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove commented out line

vDefaults1.addParameter<double>("phi", 0.0);
vDefaults.push_back(vDefaults1);
desc.addVPSet("points", descPoints,vDefaults);
*/
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove commented out lines

@@ -227,6 +238,7 @@ class PointSeededTrackingRegionsProducer : public TrackingRegionProducer
++n_regions;
}
}
//std::cout<<"n_seeded_regions = "<<n_regions<<std::endl;
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove commented out line

@cmsbuild
Copy link
Contributor

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

@perrotta
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 23, 2017

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

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

double x = std::cos(phiPoints[i]);
double y = std::sin(phiPoints[i]);
double theta = 2*std::atan(std::exp(-etaPoints[i]));
double z = 1./std::tan(theta);
Copy link
Contributor

Choose a reason for hiding this comment

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

how about
z = ( 1−exp(-η)² ) / (2 * exp(-η))
?

No idea whether it is more accurate and/or faster or neither...

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 1693 differences found in the comparisons
  • DQMHistoTests: Total files compared: 24
  • DQMHistoTests: Total histograms compared: 1833058
  • DQMHistoTests: Total failures: 13521
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1819357
  • DQMHistoTests: Total skipped: 180
  • DQMHistoTests: Total Missing objects: 0
  • Checked 98 log files, 14 edm output root files, 24 DQM output files

@perrotta
Copy link
Contributor

+1
PointSeededTrackingRegionsProducer.h is updated with a fillDescription method
No changes expected and no changes observed in outputs
(same as #18817 (comment): latest additions only improved this PR)
(comments #18817 (comment) is probably worth to pursue, but quite likely of very limited impact on the overall CPU time, and it can be postponed)

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

// basic inputsi
edm::ParameterSet points = regPSet.getParameter<edm::ParameterSet>("points");
etaPoints = points.getParameter<std::vector<double>>("eta");
phiPoints = points.getParameter<std::vector<double>>("phi");
Copy link
Contributor

Choose a reason for hiding this comment

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

I liked the previous form of points more (vector of PSets with eta and phi attributes instead of two vectors of doubles). That doesn't prevent storing the eta and phi values as vector<double> members.

OTOH I don't want to delay this PR any further, and maybe after its integration it's not worth to change the configuration interface anymore (before next year at least).

Copy link
Contributor

Choose a reason for hiding this comment

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

I see your point; I agree a vector of PSet makes more sense, but indeed it should be converted into a vector of doubles, or better into a vector of "coordinates", defined for example as

struct EtaPhi {
  double eta;
  double phi;
}

Copy link
Contributor

Choose a reason for hiding this comment

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

In fact, the convertsion from eta/phi to x/y/z culd also be done at construction time

Copy link
Contributor

Choose a reason for hiding this comment

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

float use float

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree on both points

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 8aa6220 into cms-sw:master May 24, 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

8 participants