Consumes migration for L1GtUtils #9055
Conversation
This modifies L1GtUtils to call the consumes function for all the products it gets. Also the L1GtAnalyzer module has consumes calls added. They also use getByToken instead of getByLabel now. I did not yet modify all the modules that use L1GtUtils yet. This will be done next in a separate commit. Modules will need to use a different L1GtUtils constructor and the arguments determine the behavior. This preserves the previous behavior where it is possible to have L1GtUtils look for the products by type without specifying the InputTags in the configuration. This will make the migration of the modules easier as configurations will not need modification to add the InputTag parameters. It is also possible to pass the InputTags into the constructor as arguments which was also an option in the earlier versions. And I added the the new possibility to set the InputTags in the configuration as well. All modules that use L1GtUtils will also have to remove InputTags where they were being passed in at points other than the constructor. They have to be set in the constructor now. This has to be decided earlier and the module can no longer decide the InputTag when processing the event or run. The new L1GtUtilsHelper class encapsulates most of the logic of the input tag selection and holds the EDGetTokens.
The previous commit added the consumes calls for L1GtUtils. This commit modifies the things that depend on L1GtUtils so that they still work with the modified L1GtUtils. New arguments were added to the L1GtUtils constructor. Specifying InputTags to other functions in L1GtUtils is no longer allowed. Some modules directly use L1GtUtils and some use it through a helper class. The most significant of the helper classes was HLTConfigProvider. In that case, the four functions that required its L1GtUtils member were split into a new helper class HLTPrescaleProvider. Modules that did not use those functions does not need modification, but those that did now have to use HLTPrescaleProvider.
An earlier commit added the consumes calls for L1GtUtils. This commit modifies the things that depend on L1GtUtils so that they still work with the modified L1GtUtils.
Fix logic in earlier commit (not submitted in a pull request yet). You cannot call getByToken with an uninitialized token. Also pick the first product found instead of the last so we do not declare we consume multiple products (should not make any difference if there is only one).
Fix a couple minor problems in earlier commits which were not submitted in a PR yet.
|
A new Pull Request was created by @wddgit (W. David Dagenhart) for CMSSW_7_5_X. Consumes migration for L1GtUtils It involves the following packages: Calibration/HcalCalibAlgos @perrotta, @cmsbuild, @diguida, @cvuosalo, @boudoul, @fwyzard, @franzoni, @cerminar, @monttj, @Martin-Grunewald, @srimanob, @nclopezo, @deguio, @slava77, @vadler, @mmusich, @mulhearn, @danduggan can you please review it and eventually sign? Thanks. |
|
@cmsbuild please test |
|
The tests are being triggered in jenkins. |
|
+1 |
|
Many many many thanks for this. This was a real nightmare. |
cmsbuild
added
analysis-pending
alca-pending
dqm-approved
hlt-approved
l1-approved
reconstruction-approved
pending-signatures
tests-approved
orp-pending
comparison-available
pdmv-pending
and removed
alca-pending
analysis-pending
comparison-available
dqm-approved
hlt-approved
l1-pending
orp-pending
pdmv-pending
pending-signatures
reconstruction-approved
tests-approved
labels
Consumes migration for L1GtUtils
This modifies L1GtUtils to call the consumes function
for all the products it gets. It also modifies the numerous
modules that use L1GtUtils to work with these changes.
The L1GtUtils constructor is modified and its arguments
determine its behavior. This PR preserves the previous
behavior where it is possible to have L1GtUtils look for
the products by type without specifying the InputTags in
the configuration. This makes the migration of the
modules easier as configurations will not need modification
to add the InputTag parameters. It is also possible to pass
the InputTags into the constructor as arguments, which was
also an option in the earlier versions. And I added the the new
possibility to set the InputTags in the configuration as well.
All modules that use L1GtUtils will also have to remove InputTags
where they were being passed in at points other than the constructor.
They have to be set in the constructor now. This has to be decided
earlier and the module can no longer decide the InputTag when processing
the event or run.
The new L1GtUtilsHelper class encapsulates most of the logic of the
input tag selection and holds the EDGetTokens. It also registers the
callback function (its operator() function) which is called for all products
in the ProductRegistry if the InputTags are not specified in the configuration
or as arguments to the constructor.