update number/names of layers/disks for phase 1 upgrade

[capalmer85]

No description provided.

[cmsbuild]

A new Pull Request was created by @capalmer85 for master.

It involves the following packages:

DQM/PixelLumi

@cmsbuild, @dmitrijus, @vanbesien, @davidlange6 can you please review it and eventually sign? Thanks.
@davidlange6 you are the release manager for this.

cms-bot commands are listed here

[capalmer85]

If I say "please test", will the bot comply?

[capalmer85]

@cmsbuild please test

[capalmer85]

@dmitrijus, @vanbesien... ok... so I can't ask @cmsbuild to do anything.

[dmitrijus]

please test

[cmsbuild]

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

[dmitrijus]

Using std::cout/cerr is not allowed, please replace those with edm::LogWarning

[cmsbuild]

+1
Tested at: 0019c75
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-19118/20533/summary.html

[cmsbuild]

Comparison job queued.

[cmsbuild]

Pull request #19118 was updated. @cmsbuild, @dmitrijus, @vanbesien, @davidlange6 can you please check and sign again.

[capalmer85]

@dmitrijus I changed the std::cout's. Sorry about that.

[cmsbuild]

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

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 22
• DQMHistoTests: Total histograms compared: 1817824
• DQMHistoTests: Total failures: 34661
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 1782997
• DQMHistoTests: Total skipped: 166
• DQMHistoTests: Total Missing objects: 0
• Checked 90 log files, 14 edm output root files, 22 DQM output files

[dmitrijus]

+1

[cmsbuild]

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

[cmsbuild]

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

[cmsbuild]

+1
Tested at: 3028ead
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-19118/20598/summary.html

[cmsbuild]

Comparison job queued.

[cmsbuild]

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

Comparison Summary:

• You potentially added 3 lines to the logs
• Reco comparison results: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 22
• DQMHistoTests: Total histograms compared: 1803136
• DQMHistoTests: Total failures: 14913
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 1788057
• DQMHistoTests: Total skipped: 166
• DQMHistoTests: Total Missing objects: 0
• Checked 90 log files, 14 edm output root files, 22 DQM output files

[capalmer85]

Still not merged?

[capalmer85]

Why is this not merge? @davidlange6 Is this not running online? @dmitrijus

[dmitrijus]

@capalmer85 This PR should be running on the online DQM.

I don't know why it has not been merged. The change seems trivial and should only affect the online DQM.

[davidlange6]

+1
unfortunate no attempt is made to make this backwards compatible..hopefully it stays online only.

[capalmer85]

@davidlange6 if that feedback was given any time between mid-june and now, I would have worked on tried.

[Dr15Jones]

It appears this pull request is causing the gcc7 builds to have linking problems:https://cmssdt.cern.ch/SDT/cgi-bin/buildlogs/slc6_amd64_gcc700/CMSSW_9_3_X_2017-08-29-1100/DQM/PixelLumi

I believe the easiest fix would be to change

static size_t const kNumLayers = 5;
static size_t const kNumDisks = 12;
static size_t const kOffsetLayers = 0;
static size_t const kOffsetDisks = 4;

to

static size_t constexpr const kNumLayers = 5;
static size_t constexpr const kNumDisks = 12;
static size_t constexpr const kOffsetLayers = 0;
static size_t constexpr const kOffsetDisks = 4;

[smuzaffar]

@Dr15Jones , https://github.com/cms-sw/cmssw/pull/20293/files fixes this. Should we use
static size_t constexpr const instead of static constexpr size_t

[Dr15Jones]

From http://en.cppreference.com/w/cpp/language/constexpr

A constexpr specifier used in an object declaration implies const

so no need to change the other pull request.