Re-enable trigger cache.

[bbockelm]

This re-enables the trigger cache, which provides a bit more than an order-magnitude speedup for edmCopyPickEvent over high-latency.

This additionally remove errant copy/pasted code blocks and guarantees that an assert cannot be hit.

@osschar

[cmsbuild]

@bbockelm, CMSSW_9_3_X branch is closed for direct updates. cms-bot is going to move this PR to master branch.
In future, please use cmssw master branch to submit your changes.

[cmsbuild]

A new Pull Request was created by @bbockelm (Brian Bockelman) for master.

It involves the following packages:

IOPool/Input

@cmsbuild, @smuzaffar, @Dr15Jones can you please review it and eventually sign? Thanks.
@wddgit this is something you requested to watch as well.
@davidlange6 you are the release manager for this.

cms-bot commands are listed here

[Dr15Jones]

please test

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/22150/console Started: 2017/08/08 23:08

[Dr15Jones]

Any ideas why this may have caused problems when we first switched to multi-threading?

[bbockelm]

The only possible case was when the switchover entry would be set to 0 (everything else was excluded by prior if-cases); we simply changed things to guarantee that the entry was set to > 0.

[cmsbuild]

+1
Tested at: 0ac81b7
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-20084/22150/summary.html

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

[cmsbuild]

Comparison job queued.

[cmsbuild]

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

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 25
• DQMHistoTests: Total histograms compared: 2646495
• DQMHistoTests: Total failures: 197
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2646117
• DQMHistoTests: Total skipped: 181
• DQMHistoTests: Total Missing objects: 0
• Checked 102 log files, 14 edm output root files, 25 DQM output files

[Dr15Jones]

+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, @smuzaffar (and backports should be raised in the release meeting by the corresponding L2)

[davidlange6]

+1