Skip to content
Snippets Groups Projects

CPAlgorithms: distinguish between MC and data when writing output branches

Merged CPAlgorithms: distinguish between MC and data when writing output branches
ravinab/athena:ravinab-main-patch-7bc8 into main
1 unresolved thread
Merged Baptiste Ravina requested to merge ravinab/athena:ravinab-main-patch-7bc8 into main
1 unresolved thread

We allow to pass an optional list of branch mappings varsOnlyForMC to the Output block. This allows the use of a single config file for both MC and data runs, when the user requests MC-specific decorations to be written to the output (e.g. truth information like HadronConeExclTruthLabelID for jets).

Merge request reports

Pipeline #7039901 passed

Stage: external

    Pipeline passed for f6ad6d4e on ravinab:ravinab-main-patch-7bc8

    Approval is optional

    Merged by Walter LamplWalter Lampl 1 year ago (Mar 15, 2024 1:16pm UTC)

    Merge details

    • Changes merged into main with f3b98eee (commits were squashed).
    • Deleted the source branch.

    Activity

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

    added 1 commit

    Compare with previous version

  • Baptiste Ravina resolved all threads

    resolved all threads

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash c1082424)

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

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :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 6188] (remote access info)

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms

    This merge request affects 1 file:

    • PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/OutputAnalysisConfig.py

    Adding @krumnack ,@tadej as watchers

  • Romain Bouquet
    Romain Bouquet @robouque ·
    Developer

    MR looks good to me thus approving - AR

  • Romain Bouquet removed analysis-review-required label

    removed analysis-review-required label

  • Romain Bouquet added analysis-review-approved label

    added analysis-review-approved label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :x: CI Result FAILURE (hash 59b66a7f)

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

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :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 6195] (remote access info)

  • Baptiste Ravina added 1 commit

    added 1 commit

    • f6ad6d4e - set union of vars and autoVars

    Compare with previous version

  • Tadej Novak
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms

    This merge request affects 1 file:

    • PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/OutputAnalysisConfig.py

    Adding @krumnack ,@tadej as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash f6ad6d4e)

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

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :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 6222] (remote access info)

  • J
    Jakub Kremer @jkremer ·
    Developer

    Changes look good - @ravinab, can you please address the open thread?

    L1 shifter

  • Jakub Kremer added review-user-action-required label and removed review-pending-level-1 label

    added review-user-action-required label and removed review-pending-level-1 label

  • Nils Erik Krumnack resolved all threads

    resolved all threads

  • Nils Erik Krumnack added review-pending-level-1 label and removed review-user-action-required label

    added review-pending-level-1 label and removed review-user-action-required label

  • K
    Nils Erik Krumnack @krumnack ·
    Developer

    @jkremer I closed the thread, please take another look.

  • Yuriy Volkotrub
    Yuriy Volkotrub @yvolkotr ·
    Developer

    MR looks good to me thus approving - L1 shifter

  • Yuriy Volkotrub removed review-pending-level-1 label

    removed review-pending-level-1 label

  • Yuriy Volkotrub added review-approved label

    added review-approved label

  • Walter Lampl merged

    merged

  • Walter Lampl mentioned in commit f3b98eee

    mentioned in commit f3b98eee

  • Baptiste Ravina mentioned in merge request !70051 (merged)

    mentioned in merge request !70051 (merged)

  • Thomas Strebler
    Thomas Strebler @tstreble started a thread on the diff
    • PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/OutputAnalysisConfig.py
    24 25
    25 26 def makeAlgs (self, config) :
    26 27
    28 self.vars = set(self.vars)
    29 self.varsOnlyForMC = set(self.varsOnlyForMC)
    30 # merge the MC-specific branches into the main list only if we are not running on data
    31 if config.dataType() is not DataType.Data:
    32 self.vars |= self.varsOnlyForMC
  • Thomas Strebler mentioned in merge request easyjet/easyjet!609 (merged)

    mentioned in merge request easyjet/easyjet!609 (merged)

  • Thomas Strebler mentioned in merge request !71009 (merged)

    mentioned in merge request !71009 (merged)

    • Please register or sign in to reply