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

FIX in GBL reference trajectories: add missing initialisations #20262

Merged

Conversation

mschrode
Copy link

Adds missing matrix initialisations to the EIGEN matrices.
This was not needed in previous implementation of GBL based on ROOT TMatrix
(ROOT presets matrices to 0., EIGEN not).

Fix provided by @ckleinw

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @mschrode (Matthias Schroeder) for master.

It involves the following packages:

Alignment/ReferenceTrajectories

@ghellwig, @arunhep, @cerminar, @cmsbuild, @franzoni, @lpernie can you please review it and eventually sign? Thanks.
@ghellwig, @mmusich, @tocheng, @tlampen this is something you requested to watch as well.
@davidlange6, @slava77 you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/PR-20262/298

@franzoni
Copy link

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 29, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/22556/console Started: 2017/08/29 14:54

@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-20262/22556/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: 2653934
  • DQMHistoTests: Total failures: 217
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2653528
  • DQMHistoTests: Total skipped: 189
  • DQMHistoTests: Total Missing objects: 0
  • Checked 107 log files, 14 edm output root files, 26 DQM output files

Copy link

@ghellwig ghellwig left a comment

Choose a reason for hiding this comment

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

@mschrode Seem to be only minor changes and therefore, I have only the cosmetic comments above.
However, since you use hardcoded numbers (5, 7), you should include them.

PS: Back from parental leave ;)

@@ -603,6 +603,7 @@ namespace gbl {

int nOffset = aPoint.getOffset();

for (unsigned int i = 0; i < 5; ++i) anIndex[i] = 0;
Copy link

Choose a reason for hiding this comment

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

@ckleinw, @mschrode I propose to replace this with the simpler statement

anIndex = {};

This sets every non-specified element to zero, i.e. all of them.

@@ -697,6 +698,7 @@ namespace gbl {

int nOffset = aPoint.getOffset();

for (unsigned int i = 0; i < 7; ++i) anIndex[i] = 0;
Copy link

Choose a reason for hiding this comment

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

see above

@@ -1077,13 +1079,15 @@ namespace gbl {
if (measDim > 2) {
matPDer = matP * matDer;
} else { // 'shortcut' for position measurements
matPDer.setZero();
Copy link

Choose a reason for hiding this comment

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

@mschrode please stick to the indentation. This is likely due to tabs in the preceding whitespace.

matPDer.block<2, 5>(3, 0) = matP.block<2, 2>(3, 3)
* matDer.block<2, 5>(3, 0);
}

if (numInnerTrans > 0) {
// transform for external parameters
proDer.resize(measDim, Eigen::NoChange);
proDer.setZero();
Copy link

Choose a reason for hiding this comment

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

see above

@@ -1151,6 +1155,7 @@ namespace gbl {
if (numInnerTrans > 0) {
// transform for external parameters
proDer.resize(nDim, Eigen::NoChange);
proDer.setZero();
Copy link

Choose a reason for hiding this comment

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

see above

@smuzaffar smuzaffar modified the milestones: CMSSW_9_4_X, CMSSW_9_3_X Sep 6, 2017
@ghellwig
Copy link

ghellwig commented Sep 6, 2017

@mschrode Since the master is now 94X, you might consider backporting this (now 94X) PR to 93X.
As @arunhep pointed out in your other backports, you can close the PRs for 90X and 91X.

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs after it passes the integration tests. This pull request will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar (and backports should be raised in the release meeting by the corresponding L2)

@cmsbuild
Copy link
Contributor

-1

Tested at: 3eb9476

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
e133687
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20262/23075/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20262/23075/git-merge-result

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20262/23075/summary.html

I found follow errors while testing this PR

Failed tests: AddOn

  • AddOn:

I found errors in the following addon tests:

cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_PIon --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2017 --eventcontent RAW --fileout file:RelVal_Raw_PIon_DATA.root --filein /store/data/Run2017A/HLTPhysics4/RAW/v1/000/295/606/00000/36DE5E0A-3645-E711-8FA1-02163E01A43B.root : FAILED - time: date Tue Sep 19 17:10:39 2017-date Tue Sep 19 17:07:26 2017 s - exit: 23552
cmsRun /cvmfs/cms-ib.cern.ch/nweek-02490/slc6_amd64_gcc630/cms/cmssw/CMSSW_9_4_X_2017-09-19-0700/src/HLTrigger/Configuration/test/OnLine_HLT_PIon.py realData=True globalTag=@ inputFiles=@ : FAILED - time: date Tue Sep 19 17:10:39 2017-date Tue Sep 19 17:07:26 2017 s - exit: 21504
cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --processName=HLTRECO --filein file:RelVal_Raw_PIon_DATA.root --fileout file:RelVal_Raw_PIon_DATA_HLT_RECO.root : FAILED - time: date Tue Sep 19 17:10:39 2017-date Tue Sep 19 17:07:26 2017 s - exit: 21504

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
e133687
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20262/23075/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20262/23075/git-merge-result

@cmsbuild
Copy link
Contributor

Comparison job queued.

@ghellwig
Copy link

failure seems unrelated
I have seen this already in another PR, but I retriggered the tests after fixing something minor that was totally unrelated to the addOn test, but the tests passed the second time
@davidlange6, @smuzaffar is there some known issue?

@ghellwig
Copy link

please test
(hoping the xrootd failure vanishes...)

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 19, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/23093/console Started: 2017/09/19 21:03

@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-20262/23093/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: 2649068
  • DQMHistoTests: Total failures: 231
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2648648
  • DQMHistoTests: Total skipped: 189
  • DQMHistoTests: Total Missing objects: 0
  • Checked 107 log files, 14 edm output root files, 26 DQM output files

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit f43cb99 into cms-sw:master Sep 20, 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

7 participants