Fix consumes for phase2 premixing and reduce code duplication in EcalDigiProducer

[makortel]

The consumes for EB/EE/ES PCaloHits is controlled with doEB/doEE/doES, but the getByLabel() for signal and pileup events were called for all EB/EE/ES regardless of the doEX flags. In phase2 premixing stage2 (in DataMixingModule/PreMixingModule) these would lead to "get products without calling consumes" exception (I don't know why the regular mixing works), so this PR calls getByLabel() only for the enabled subdetectors.

In addition I use the occasion to reduce the duplicated code in the constructors by removing almost everything from one of them and calling the other one from it. This change also fixes a bug in APD simulation that was fixed in #17300 for classical mixing for premixing (I presume this effect won't be seen in PR tests quoting from #17300 "the code that's not used in the standard sequences" (needed only if one wants to simulate ECAL barrel "spike" noise)".

Tested in CMSSW_10_1_X_2018-03-05-2300, no changes expected.

@mdhildreth @kpedro88

[cmsbuild]

The code-checks are being triggered in jenkins.

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-22581/3914

[cmsbuild]

A new Pull Request was created by @makortel (Matti Kortelainen) for master.

It involves the following packages:

SimCalorimetry/EcalSimProducers

@cmsbuild, @civanch, @mdhildreth can you please review it and eventually sign? Thanks.
@argiro 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

[davidlange6]

please test

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/26785/console Started: 2018/03/12 10:44

[cmsbuild]

+1
Tested at: b5e8e59
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-22581/26785/summary.html

[cmsbuild]

Comparison job queued.

[cmsbuild]

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

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 4 differences found in the comparisons
• DQMHistoTests: Total files compared: 29
• DQMHistoTests: Total histograms compared: 2477919
• DQMHistoTests: Total failures: 1
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2477742
• DQMHistoTests: Total skipped: 176
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 1.1000000001 KiB( 22 files compared)
• Checked 118 log files, 9 edm output root files, 29 DQM output files

[civanch]

@makortel , if fix the Producer why not to use GetByToken ?

[makortel]

@civanch I'd prefer to leave that to the code authors.

[kpedro88]

@civanch I think there's some reason for this having to do with pileup mixing, but don't remember exactly.

[civanch]

+1

[cmsbuild]

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)

[makortel]

I think there's some reason for this having to do with pileup mixing, but don't remember exactly.

AFAIK getByToken() could be done for the signal Event, but not for the pileup PileUpEventPrincipal (actually wouldn't make much sense for the latter as the *MixingModule owns the source of them so there can't be any other clients).

[fabiocos]

please test

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/27195/console Started: 2018/03/29 17:10

[cmsbuild]

+1
Tested at: b5e8e59
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-22581/27195/summary.html

[cmsbuild]

Comparison job queued.

[cmsbuild]

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

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 29
• DQMHistoTests: Total histograms compared: 2501822
• DQMHistoTests: Total failures: 1
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2501645
• DQMHistoTests: Total skipped: 176
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 1.2300000001 KiB( 23 files compared)
• Checked 119 log files, 9 edm output root files, 29 DQM output files

[fabiocos]

+1