From a9af9e9fff1e358ab68301f9b15b5ac9bbf8e74c Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Wed, 7 Feb 2018 19:45:58 +0000
Subject: [PATCH] Merge branch '21.0-dq-disable-pixmon-in-esdtoaod' into '21.0'
Disable pixel monitoring in AODtoHIST and ESDtoAOD (ATLASDQ-530)
See merge request atlas/athena!8562
(cherry picked from commit ba602fdf7953107e38984ce7d6da1e84ae14aa41 [formerly 3fb11be97a2f26ad55ec654ef182a7f69f7a8c15])
f0082323 Disable pixel monitoring in AODtoHIST and ESDtoAOD (ATLASDQ-530)
Former-commit-id: 1c1015b53cc5e5527795538792148a1e6ab5ce60
---
.../share/DQMonFlagsConfig_jobOptions.py | 2 ++
.../share/LUT_mc12.root | Bin
2 files changed, 2 insertions(+)
mode change 100755 => 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
diff --git a/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py b/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
index 05531ce889a..f137f6cb18b 100644
--- a/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
+++ b/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
@@ -110,6 +110,7 @@ else:
# DQMonFlags.doJetMon=False
# ??
DQMonFlags.doCTPMon=False
+ DQMonFlags.doPixelMon=False
DQMonFlags.doSCTMon=False
DQMonFlags.doTRTMon=False
DQMonFlags.doTRTElectronMon=False
@@ -127,6 +128,7 @@ else:
elif DQMonFlags.monManEnvironment == 'tier0ESD':
DQMonFlags.histogramFile='MonitorESD.root'
DQMonFlags.doCTPMon=False
+ DQMonFlags.doPixelMon=False
DQMonFlags.doSCTMon=False
DQMonFlags.doTRTMon=False
DQMonFlags.doTRTElectronMon=False
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
old mode 100755
new mode 100644
--
GitLab