From 9493e6550778c7a0a1e6a8989ee6a0136d99ebde Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Tue, 30 Oct 2018 19:15:57 +0000
Subject: [PATCH] Merge branch 'dq-devel' into '21.0'

Tuning of DQWebDisplay for the HI run

See merge request atlas/athena!15421

(cherry picked from commit 46dfa1ea554f7300662a8399b94b0d15b4cbd1b2)

7c55cdb3 Tuning of DQWebDisplay for the HI run
---
 .../python/iconfTool/gui/__init__.py          |  0
 .../config/Jets/heavyions_minutes10.config    | 22 +++++++++++++------
 .../config/Jets/heavyions_run.config          | 20 ++++++++++++-----
 3 files changed, 29 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 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 100644
new mode 100755
diff --git a/DataQuality/DataQualityConfigurations/config/Jets/heavyions_minutes10.config b/DataQuality/DataQualityConfigurations/config/Jets/heavyions_minutes10.config
index 349ef6b1a437..fa250aad10e2 100644
--- a/DataQuality/DataQualityConfigurations/config/Jets/heavyions_minutes10.config
+++ b/DataQuality/DataQualityConfigurations/config/Jets/heavyions_minutes10.config
@@ -1,5 +1,5 @@
 # **********************************************************************
-# # $Id: heavyions_minutes10.config 782001 2016-11-02 22:37:15Z jfrost $
+# # $Id: heavyions_run.config 779320 2016-10-19 22:53:24Z jfrost $
 # # *********************************************************************
 #
 # ########################################################
@@ -779,17 +779,25 @@ dir Jets {
     #####################Subtraction####################
     hist 2dSubtractedET_Centrality@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = LogZ,AxisRange(0,3,"X"),AxisRange(0,50,"Y"), StatBox
+      display = LogZ,AxisRange(0,6,"X"),AxisRange(0,240,"Y"), StatBox
     }
 
     hist SubtractedET_Centrality@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = AxisRange(0,3,"X"), StatBox
+      display = AxisRange(0,6,"X"), StatBox
+    }
+
+    hist 2dSubtractedET_pT@UESubtracted {
+      output = Jets/AntiKt4HIJets/Details/UESubtracted
+    }
+
+    hist SubtractedET_pT@UESubtracted {
+      output = Jets/AntiKt4HIJets/Details/UESubtracted
     }
 
   hist 2dSubtractedET_Expected_Centrality@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = AxisRange(0,3,"X"), StatBox
+      display = AxisRange(0,6,"X"), StatBox
     }
 
   hist 2dSubtractedET_Expected_eta@UESubtracted {
@@ -835,7 +843,7 @@ dir Jets {
 
     hist 2dSubtractedET_2Dphi@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = LogZ,AxisRange(0,50,"Y"),StatBox
+      display = LogZ,AxisRange(0,250,"Y"),StatBox
     }
 
 #    hist 2dSubtractedET_2Dphi_0_10@UESubtracted {
@@ -855,7 +863,7 @@ dir Jets {
 
     hist SubtractedET_2Dphi@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = StatBox,AxisRange(0,50,"Y")
+      display = StatBox,AxisRange(0,240,"Y")
     }
 
 #    hist SubtractedET_2Dphi_0_10@UESubtracted {
@@ -895,7 +903,7 @@ dir Jets {
 
     hist SubtractedET_pt@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = AxisRange(0,300,"X"), LogX, StatBox
+      display = AxisRange(0,500,"X"), LogX, StatBox
     }
 
 #    hist SubtractedET_pt_0_10@UESubtracted {
diff --git a/DataQuality/DataQualityConfigurations/config/Jets/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/Jets/heavyions_run.config
index 70b9d8b5aeb5..fa250aad10e2 100644
--- a/DataQuality/DataQualityConfigurations/config/Jets/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/Jets/heavyions_run.config
@@ -779,17 +779,25 @@ dir Jets {
     #####################Subtraction####################
     hist 2dSubtractedET_Centrality@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = LogZ,AxisRange(0,3,"X"),AxisRange(0,50,"Y"), StatBox
+      display = LogZ,AxisRange(0,6,"X"),AxisRange(0,240,"Y"), StatBox
     }
 
     hist SubtractedET_Centrality@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = AxisRange(0,3,"X"), StatBox
+      display = AxisRange(0,6,"X"), StatBox
+    }
+
+    hist 2dSubtractedET_pT@UESubtracted {
+      output = Jets/AntiKt4HIJets/Details/UESubtracted
+    }
+
+    hist SubtractedET_pT@UESubtracted {
+      output = Jets/AntiKt4HIJets/Details/UESubtracted
     }
 
   hist 2dSubtractedET_Expected_Centrality@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = AxisRange(0,3,"X"), StatBox
+      display = AxisRange(0,6,"X"), StatBox
     }
 
   hist 2dSubtractedET_Expected_eta@UESubtracted {
@@ -835,7 +843,7 @@ dir Jets {
 
     hist 2dSubtractedET_2Dphi@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = LogZ,AxisRange(0,50,"Y"),StatBox
+      display = LogZ,AxisRange(0,250,"Y"),StatBox
     }
 
 #    hist 2dSubtractedET_2Dphi_0_10@UESubtracted {
@@ -855,7 +863,7 @@ dir Jets {
 
     hist SubtractedET_2Dphi@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = StatBox,AxisRange(0,50,"Y")
+      display = StatBox,AxisRange(0,240,"Y")
     }
 
 #    hist SubtractedET_2Dphi_0_10@UESubtracted {
@@ -895,7 +903,7 @@ dir Jets {
 
     hist SubtractedET_pt@UESubtracted {
       output = Jets/AntiKt4HIJets/Details/UESubtracted
-      display = AxisRange(0,300,"X"), LogX, StatBox
+      display = AxisRange(0,500,"X"), LogX, StatBox
     }
 
 #    hist SubtractedET_pt_0_10@UESubtracted {
-- 
GitLab