From a829f3bb636cec8fb5d09446d140bfb1dc50bf32 Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Thu, 1 Nov 2018 23:28:42 +0000
Subject: [PATCH] Merge branch '21.0-HI-monitoring-steering' into '21.0'
Functional stream-aware monitoring for HI
See merge request atlas/athena!15529
(cherry picked from commit 4ed198a68789edfa5c7347dadbec2a11983a0fa4)
29913ca3 Functional stream-aware monitoring for HI
---
Control/AthenaConfiguration/python/iconfTool/gui/__init__.py | 0
.../AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py | 5 +++--
2 files changed, 3 insertions(+), 2 deletions(-)
mode change 100755 => 100644 Control/AthenaConfiguration/python/iconfTool/gui/__init__.py
diff --git a/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py b/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py
old mode 100755
new mode 100644
diff --git a/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py b/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
index f137f6cb18b..bb672ba9676 100644
--- a/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
+++ b/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
@@ -274,9 +274,10 @@ if DQMonFlags.doStreamAwareMon:
LArMonFlags.doLArNoisyROMon=True
# All monitoring turned on for express stream (except LArRawChannelMon)
- # HIP runs will use the express settings for MinBias, MinBiasOverlay, HardProbes, bulk, and UPC
+ # HIP/HI runs will use the express settings for MinBias, MinBiasOverlay, HardProbes, bulk, and UPC
if (rec.triggerStream()=='express' or rec.triggerStream()=='Main' or
- (rec.doHIP() and rec.triggerStream() in ['MinBias', 'MinBiasOverlay', 'HardProbes', 'bulk', 'UPC'])):
+ ((rec.doHIP() or rec.doHeavyIon())
+ and rec.triggerStream() in ['MinBias', 'MinBiasOverlay', 'HardProbes', 'bulk', 'UPC'])):
LArMonFlags.doLArCollisionTimeMon=True
LArMonFlags.doLArAffectedRegions=True
LArMonFlags.doLArHVCorrectionMonTool=True
--
GitLab