Add caloConfig and caloConfigSource to L1 step

[mark-grimes]

AddOn tests for #11690 (switch AddOn tests to eras) showed that the L1 step was missing process.caloConfig and process.caloConfigSource when configured with eras. This adds them in. I'm still checking why this wasn't noticed in the checks for #11466 (switch matrix tests to eras). I'm pretty sure it's because whenever L1 was run, L1Reco is also run which also adds them. It's only when L1 is run without L1Reco.

Once this is submitted I'll run config diffs of with and without this change.

Eras in this config file are a bit messy. After talking with some L1 experts I think it would be much better to flatten out the structure by getting rid of the cfi files in the load commands and applying the changes directly in SimL1Emulator_cff. I'll leave this for another time though.

[cmsbuild]

A new Pull Request was created by @mark-grimes (Mark Grimes) for CMSSW_7_6_X.

Add caloConfig and caloConfigSource to L1 step

It involves the following packages:

L1Trigger/Configuration

@cmsbuild, @mulhearn can you please review it and eventually sign? Thanks.
@Martin-Grunewald this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
If you are a L2 or a release manager you can ask for tests by saying 'please test' in the first line of a comment.
@Degano you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

[Martin-Grunewald]

please test

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/8716/console

[cmsbuild]

+1
Tested at: d8e441b
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-11707/8716/summary.html

[mark-grimes]

I tested workflows

1000.0,1001.0,1003.0,101.0,1306.0,1330.0,135.1,135.4,140.53,25.0,250203.0,25202.0,25203.0,4.22,4.52,4.53,5.1,500203.0,50202.0,50203.0,8.0,9.0

on CMSSW_7_6_X_2015-10-08-2300 (note this IB has workflows with eras) with and without this PR. There are no differences in the configs whatsoever, since all of these workflows have L1Reco as well as L1.

[cmsbuild]

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

[mark-grimes]

AddOn tests still fail when using eras for hlt_data_50nsGRun, hlt_data_HIon, hlt_data_PIon and hlt_data_GRun. The L1REPACK step fails with the same error, so this PR needs an additional commit. Working on it now...

[Martin-Grunewald]

@mark-grimes
What is the status of the addOn test conversion to eras?

[mark-grimes]

@Martin-Grunewald
The L1REPACK step has the same problem when run alone, which happens in 4 of the AddOn tests. I could apply a fix with ~4 lines to Configuration.StandardSequences.SimL1EmulatorRepack_GCTGT_cff but the trigger configuration in these files is getting messier and messier. I've been looking at a more over-arching fix but I don't think I have the trigger knowledge to do it well.
Shall I just submit the quick fix? That will take ~5 minutes, then if/when that is merged I can open #11690 again.

[Martin-Grunewald]

@mark-grimes
Hmm, I'd prefer to move to eras here as well, so please submit the quick fix.
Thanks!

[mark-grimes]

I think I've got a good compromise between a quick and dirty fix and a long term solution.
cms-sw:CMSSW_7_6_X...mark-grimes:rearrangeStage1ConfigFiles factors out the Stage 1 changes into one cff which has every command conditional on the era - hence it always safe to import whether stage 1 is active or not.
I'm running some basic checks to make sure the other workflows are still the same, then I'll submit a PR.

[mark-grimes]

I've finished checks and submitted PR #11817