Skip to content

Clean-up of the extra-variable lists in TOPQ derivations

Knut Zoch requested to merge kzoch/athena:TOPQ-extra-content into 21.2

This MR does quite a bit of clean-up of the extra-variable lists implemented in the DerivationFrameworkTop package for TOPQ derivations. All changes do not change the derivation output. In particular, the following changes were done:

  • If explicit lists of extra variables are given, but these lists correspond to the "AllVariables" configuration, use the latter instead. "AllVariables" generally is far from ideal, but at least this way we know what we're dealing with and that we should look into reducing the requested variables. Explicitly listing variables gives the impression that all of these are important ...
  • Some variables were listed explicitly, although already included through the smart-slimming procedure. -> removed
  • Some listed variables do not exist and are not written to output. -> removed
  • Some lists of variables are empty. -> removd
  • Some lists of variables are given, but the collection is not requested, therefore those variables do not end up in the output. -> removed
  • Enforce alphabetical order of variables.
  • Move list of smart-slimming collections and of static-content containers in the slimming code.

Output is not affected by these changes; this was tested with (1) TOPQ1 MC (pass-through), (2) TOPQ1 data, (3) TOPQ4 MC (pass-through).

Merge request reports