Skip to content
Snippets Groups Projects

Reorganize L1Calo Monitoring

Merged Reorganize L1Calo Monitoring
will/athena:l1caloMonitoringRework into 24.0
1 unresolved thread
Merged Will Buttinger requested to merge will/athena:l1caloMonitoringRework into 24.0
1 unresolved thread

This is the first MR in what is a major re-organization of L1Calo monitoring as discussed @ https://indico.cern.ch/event/1364745/contributions/5777902/attachments/2809852/4903876/monitoringFeb2024.pdf

The main changes here are:

  • A new L1CaloMonitoringCfgHelper class has been created to manage the defining of all monitoring hists and trees in a coherent way, according to the new convention
  • Most of the L1Calo non-legacy monitoring algs have been moved over to using this new class
  • The new class allows us to auto-generate the config file needed for DataQualityConfigurations for all the histograms.

This MR is part of a larger project that is a work in progress, but given the significant work done so far in this MR I am pushing it.

Please note lots of bits of code are commented out, this is because this is indeed still a bit of a work in progress but we need to see how things perform in the wider setups.

Merge request reports

Checking pipeline status.

Approval is optional

Merged by John Kenneth AndersJohn Kenneth Anders 1 year ago (Mar 6, 2024 4:34pm UTC)

Merge details

  • Changes merged into 24.0 with e87397b7 (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
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigT1/TrigT1CaloMonitoring

    This merge request affects 22 files:

    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexInputMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexInputMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexInputMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/components/TrigT1CaloMonitoring_entries.cxx

    Adding @thompson ,@will as watchers

  • ATLAS Robot added 24.0 DQ JetEtmiss L1Calo Trigger review-pending-level-1 labels

    added 24.0 DQ JetEtmiss L1Calo Trigger review-pending-level-1 labels

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :x: CI Result FAILURE (hash 81222e0c)

    Athena
    externals :white_check_mark:
    cmake :white_check_mark:
    make :warning:
    tests :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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 5841] (remote access info)

  • Will Buttinger added 1 commit

    added 1 commit

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigT1/TrigT1CaloMonitoring

    This merge request affects 22 files:

    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexInputMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexInputMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexInputMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/components/TrigT1CaloMonitoring_entries.cxx

    Adding @will ,@thompson as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :x: CI Result FAILURE (hash f3a7e205)

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

    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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 5844] (remote access info)

  • Will Buttinger added 1 commit

    added 1 commit

    • 1867c1a0 - assemble a histogram name if not specified

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigT1/TrigT1CaloMonitoring

    This merge request affects 22 files:

    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexInputMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexInputMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexInputMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/components/TrigT1CaloMonitoring_entries.cxx

    Adding @thompson ,@will as watchers

  • Will Buttinger added 1 commit

    added 1 commit

    • 6e5dad87 - more fixes for histogram titles being missing

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigT1/TrigT1CaloMonitoring

    This merge request affects 22 files:

    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/EfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/GfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexInputMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/JfexSimMonitorAlgorithm.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexInputMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/EfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/GfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexInputMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexInputMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexSimMonitorAlgorithm.cxx
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/JfexSimMonitorAlgorithm.h
    • Trigger/TrigT1/TrigT1CaloMonitoring/src/components/TrigT1CaloMonitoring_entries.cxx

    Adding @thompson ,@will as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :x: CI Result FAILURE (hash 1867c1a0)

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

    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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 5849] (remote access info)

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :x: CI Result FAILURE (hash 6e5dad87)

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

    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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 5850] (remote access info)

  • Will Buttinger added 1 commit

    added 1 commit

    • 0208cb23 - allow for duplicate monitoring histogram definitions provided the definitions match perfectly.

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 2 packages:

    • Control/AthenaMonitoringKernel
    • Trigger/TrigT1/TrigT1CaloMonitoring

    Affected files list will not be printed in this case

    Adding @ssnyder ,@will ,@thompson ,@gemmeren ,@maszyman as watchers

  • ATLAS Robot added Core label

    added Core label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :x: CI Result FAILURE (hash 0208cb23)

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

    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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 5854] (remote access info)

  • Will Buttinger added 1 commit

    added 1 commit

    • cd262208 - allow for duplicate monitoring histogram definitions provided the definitions match perfectly.

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 2 packages:

    • Control/AthenaMonitoring
    • Trigger/TrigT1/TrigT1CaloMonitoring

    Affected files list will not be printed in this case

    Adding @thompson ,@gemmeren ,@maszyman ,@will ,@ssnyder as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash cd262208)

    Athena
    externals :white_check_mark:
    cmake :white_check_mark:
    make :white_check_mark:
    tests :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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 5859] (remote access info)

  • J
    Jakub Kremer @jkremer ·
    Developer

    Changes look good from L1 side (modulo commented out fragments needed in anticipation of further developments) - approving

    L1 shifter

  • Jakub Kremer added review-approved label and removed review-pending-level-1 label

    added review-approved label and removed review-pending-level-1 label

  • John Kenneth Anders added review-approved-point1 label

    added review-approved-point1 label

  • John Kenneth Anders mentioned in commit e87397b7

    mentioned in commit e87397b7

  • John Kenneth Anders merged

    merged

  • Vakhtang Tsulaia mentioned in merge request !69580 (merged)

    mentioned in merge request !69580 (merged)

  • Frank Winklmeier
    Frank Winklmeier @fwinkl started a thread on the diff
Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
381 380 #print("Configured EventAlgos:",*[alg.name for alg in cfg.getEventAlgos()])
382 381 #print("Configured CondAlgos:",*[alg.name for alg in cfg.getCondAlgos()])
383 382
383 from TrigT1CaloMonitoring.LVL1CaloMonitoringConfig import L1CaloMonitorCfgHelper
384 L1CaloMonitorCfgHelper.printHanConfig()
385
384 386
385 387 if not isComponentAccumulatorCfg():
Please register or sign in to reply