Skip to content
Snippets Groups Projects

Rework interface for GRL and PRW block configuration in CP algos

Merged Oliver Majersky requested to merge omajersk/athena:per-year-config-grl-prw into main

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.

Edited by Oliver Majersky

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Tadej Novak
  • Oliver Majersky added 1 commit

    added 1 commit

    • af7dd8ba - Handle Campaign.Unknown cases

    Compare with previous version

  • Jenkins please retry a build

  • This merge request affects 2 packages:

    • PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig
    • PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms

    Affected files list will not be printed in this case

    Adding @krumnack ,@tadej as watchers

  • Oliver Majersky added 1 commit

    added 1 commit

    • 21525bc7 - Per-year GRL configuration is not actually needed...

    Compare with previous version

  • Oliver Majersky added 1 commit

    added 1 commit

    • 6e358e4d - Per-year GRL configuration is not actually needed...

    Compare with previous version

  • :x: CI Result FAILURE (hash af7dd8ba)

    Athena AnalysisBase AthAnalysis
    externals :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark:
    make :warning: :white_check_mark: :white_check_mark:
    tests :o: :o: :o:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :warning: Athena: number of compilation errors 0, warnings 1
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 3581]

  • Oliver Majersky added 1 commit

    added 1 commit

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading