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

Extend TrackBase and Track to include time and velocity #24465

Merged
merged 2 commits into from Oct 10, 2018

Conversation

lgray
Copy link
Contributor

@lgray lgray commented Sep 4, 2018

Add time, velocity, and corresponding diagonal covariance terms to reco::TrackBase.
These (in addition to #24419) are the minimal changes needed for MTD development.

This is purely technical, getting it in place so that we can ease development.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2018

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2018

A new Pull Request was created by @lgray (Lindsey Gray) for master.

It involves the following packages:

DataFormats/GsfTrackReco
DataFormats/TrackReco

@perrotta, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@makortel, @gpetruc, @rovere, @VinInn 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

@lgray
Copy link
Contributor Author

lgray commented Sep 4, 2018

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/30259/console Started: 2018/09/04 19:18

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 5, 2018

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3143879
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3143681
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 133 log files, 14 edm output root files, 32 DQM output files

signed char nloops = 0, uint8_t stopReason = 0);
signed char nloops = 0, uint8_t stopReason = 0,
double t0 = 0, double beta = 0,
double covt0t0 = -1., double covbetabeta = -1.);
Copy link
Contributor

Choose a reason for hiding this comment

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

  • please match the indentation
  • it looks like the new arguments should be floats (with correspondingly float defaults)

TrackAlgorithm = undefAlgorithm, TrackQuality quality = undefQuality);
TrackAlgorithm = undefAlgorithm, TrackQuality quality = undefQuality,
double t0 = 0, double beta = 0,
double covt0t0 = -1., double covbetabeta = -1.);
Copy link
Contributor

Choose a reason for hiding this comment

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

  • please match the indentation
  • it looks like the new arguments should be floats (with correspondingly float defaults)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm the indentation was matched in my text editor....

Changed to double... Ditto for the other similar comment.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's the "usual" mixture of tabs and spaces, works with one tab width but not others.

@@ -50,7 +52,7 @@ class Track : public TrackBase
bool innerOk() const {
return extra_->innerOk();
}

Copy link
Contributor

Choose a reason for hiding this comment

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

the empty space change is not necessary

// Velocity at the reference point on the track
inline double TrackBase::beta() const
{
return beta_;
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this an absolute velocity, or is it normalized to c? Please clarify in the comments.

// error on beta
inline double TrackBase::betaError() const
{
return std::sqrt(covbetabeta_);
Copy link
Contributor

Choose a reason for hiding this comment

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

there should also be a way to get these without sqrt.
Perhaps covarianceT0T0 and covarianceBetaBeta.
BTW, are the two strictly related by a track-dependent constant or is there a T0Beta term?

double covt0t0, double covbetabeta) :
TrackBase(chi2, ndof, vertex, momentum, charge, cov, algo, quality,
0,0, // nloops and stop reason
t0,beta,covt0t0,covbetabeta)
Copy link
Contributor

Choose a reason for hiding this comment

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

indentation

@@ -89,10 +89,15 @@ TrackBase::TrackBase() :

TrackBase::TrackBase(double chi2, double ndof, const Point &vertex, const Vector &momentum,
int charge, const CovarianceMatrix &cov, TrackAlgorithm algorithm,
TrackQuality quality, signed char nloops, uint8_t stopReason):
TrackQuality quality, signed char nloops, uint8_t stopReason,
double t0, double beta, double covt0t0, double covbetabeta):
Copy link
Contributor

Choose a reason for hiding this comment

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

indentation


/// norm of the particle velocity at innermost point on track
/// can multiply by momentum_.Unit() to get velocity vector
float beta_;
Copy link
Contributor

Choose a reason for hiding this comment

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

please define default values here or in the default constructor.
I can't recall now if they also should be specified in the ioread rules (it's easy to check by reading an old file and checking what's in covt0t0_ )

@slava77
Copy link
Contributor

slava77 commented Sep 13, 2018

@lgray
please clarify on the plans for updating the PR to follow up on the code review.
Thank you.

@lgray
Copy link
Contributor Author

lgray commented Sep 14, 2018

I'll update this by the end of today.

@slava77
Copy link
Contributor

slava77 commented Sep 20, 2018

I'll update this by the end of today.

@lgray
please clarify on the plans for updating the PR to follow up on the code review.
thank you.

@lgray
Copy link
Contributor Author

lgray commented Sep 24, 2018

@slava77 working on it now!

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3146876
  • DQMHistoTests: Total failures: 3
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3146676
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 133 log files, 14 edm output root files, 32 DQM output files

@slava77
Copy link
Contributor

slava77 commented Sep 28, 2018

+1

for #24465 4419bc4

  • code changes are in line with the PR description and the follow up review
  • jenkins tests pass and comparisons with the baseline show no [relevant] differences
  • local tests confirm that the default values are correctly propagated when reading old data files

@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 will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@fabiocos
Copy link
Contributor

fabiocos commented Oct 2, 2018

please test workflow 22434.0

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 2, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/30836/console Started: 2018/10/02 10:11

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 2, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 2, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 2, 2018

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 2 differences found in the comparisons
  • DQMHistoTests: Total files compared: 32
  • DQMHistoTests: Total histograms compared: 3162800
  • DQMHistoTests: Total failures: 2
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3162601
  • DQMHistoTests: Total skipped: 197
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 31 files compared)
  • Checked 134 log files, 14 edm output root files, 32 DQM output files

@fabiocos
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 059e627 into cms-sw:master Oct 10, 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

6 participants