Skip to content
Snippets Groups Projects

CPAlgorithms: user-side improvements to the config blocks

Merged CPAlgorithms: user-side improvements to the config blocks
ravinab/athena:user_improvements into main
Merged Baptiste Ravina requested to merge ravinab/athena:user_improvements into main

The following changes are made to the config blocks:

  • make the MC campaign metadata accessible to the ConfigAccumulator --> allows to automatically configure the PRW
  • the PRW config block that was set up by the ConfigText is only the example one used in the CI --> rename it to "test" and set up the correct (autoconfig) PRW for actual users
  • add functions to extract the FTAG and JES MC/MC metadata information from flags, and make it accessible to the ConfigAccumulator --> allows to automatically configure the FTAG MC/MC parameter generator (unique text config instead, instead of 1 per generator)
  • remove the default variable jet_m for small-R jets --> move it to large-R jets instead

Merge request reports

Pipeline #6399586 passed

Stage: external

Pipeline passed for f0ab207a on ravinab:user_improvements

Approval is optional

Merged by Johannes ElmsheuserJohannes Elmsheuser 1 year ago (Oct 31, 2023 7:19am UTC)

Merge details

  • Changes merged into main with 654baa0e (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
PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/ConfigText.py
286 287 return
287 288 campaign, files, prwfiles, lumicalcfiles = None, None, None, None
288 289 useDefaultConfig = False
289 prwfiles, lumicalcfiles = pileupConfigFiles(dataType)
290 # need to allow for conversion of dataType from string to enum for the call to pileupConfigFiles
291 prwfiles, lumicalcfiles = pileupConfigFiles( {'data': DataType.Data, 'mc': DataType.FullSim, 'afii': DataType.FastSim}.get(dataType, dataType) )
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :pencil: Build area was cleaned as per request posted in the DB. The full software build will be performed

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 8 packages:

    • PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig
    • PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
    • PhysicsAnalysis/AnalysisCommon/PileupReweighting

    Affected files list will not be printed in this case

    Adding @krumnack ,@tadej ,@zmarshal as watchers

  • ATLAS Robot added Analysis CPAlgorithms JetEtmiss Tau Trigger analysis-review-required main review-pending-level-1 labels

    added Analysis CPAlgorithms JetEtmiss Tau Trigger analysis-review-required main review-pending-level-1 labels

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

    :x: CI Result FAILURE (hash 654d087b)

    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 340]

  • Jan-Eric Nitschke 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

  • J
    Jan-Eric Nitschke @jnitschk ·

    There are some CI failures as well as open threads. Please have a look.

    Cheers L1

  • Baptiste Ravina added 1 commit

    added 1 commit

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 8 packages:

    • PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig
    • PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
    • PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms
    • PhysicsAnalysis/AnalysisCommon/PileupReweighting

    Affected files list will not be printed in this case

    Adding @zmarshal ,@krumnack ,@tadej as watchers

  • ATLAS Robot 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

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :x: CI Result FAILURE (hash 6e69831b)

    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 365]

  • Jan-Eric Nitschke 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

  • J
    Jan-Eric Nitschke @jnitschk ·

    There are some CI failures as well as open threads. Please have a look.

    Cheers L1

  • K
    Nils Erik Krumnack @krumnack ·
    Developer

    There are some open discussions, but once they are resolved the concerns from the analysis side should be addressed. Approving from the analysis release side.

    Nils [Analysis RC]

  • Nils Erik Krumnack added analysis-review-approved label and removed analysis-review-required label

    added analysis-review-approved label and removed analysis-review-required label

  • Baptiste Ravina 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