Rework interface for GRL and PRW block configuration in CP algos
Currently, it is not possible to simultaneously provide configuration for event GRL cleaning and PRW block configuration for all years at once.
The use-case for this scenario is if users cannot use the default auto-configured GRL and PRW and lumicalc config files for their analysis but need to specify them (for example because they use non-standard GRL where one also needs corresponding lumicalc and actualMu files for PRW).
When using YAML configuration, this limitation would imply writing separate YAML file for each sub-campaign (e.g. mc20a/d/e, mc23a/d)...we don't want to repeat this bookkeeping nightmare again.
The proposed solution here introduces extra options userLumicalcFilesPerCampaign
, userPileupConfigsPerCampaign
for PileupAnalysisConfig
and userGRLFilesPerYear
for EventCleaningConfig
. These options require passing a dictionary which maps MC campaign or data year onto a list of files.
For backwards compatibility reasons, also the old userLumicalcFiles
, userPileupConfigs
and userGRLFiles
, which simply require a list of files each, are kept. A check is done to ensure that people don't accidentally use both the legacy and the per-year/campaign options.
The PRW auto-configuration was also slightly cleaned up to make the control logic a bit clearer.
Merge request reports
Activity
CI Result FAILURE (hash 4d6a09f8)Athena AnalysisBase AthAnalysis externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 1
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 3575]removed analysis-review-required label
removed review-pending-level-1 label
- Resolved by Oliver Majersky
- Resolved by Oliver Majersky
added analysis-review-required label
removed analysis-review-required label
added 1 commit
- 21525bc7 - Per-year GRL configuration is not actually needed...
added 1 commit
- 6e358e4d - Per-year GRL configuration is not actually needed...
CI Result FAILURE (hash af7dd8ba)Athena AnalysisBase AthAnalysis externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 1
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 3581]