From f6c4f71eb436123e131c0ca3e0dfbef253b014e2 Mon Sep 17 00:00:00 2001
From: Liaoshan Shi <liaoshan.shi@cern.ch>
Date: Tue, 27 Oct 2020 11:02:12 +0000
Subject: [PATCH] Update keycount value to follow emon update
Previous value was set to the total total number
of samplers that all monitors of the same type have to connect.
New value is the number of samplers per monitoring task.
---
.../InDetRecExample/share/InDetRecConditionsAccess.py | 4 +++-
.../RecExample/RecExConfig/python/AutoConfiguration.py | 4 ++--
.../RecExample/RecExOnline/share/RecExOnline_postconfig.py | 2 --
graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index 4bd12cf7a382..4054e492ba74 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -66,7 +66,9 @@ if DetFlags.pixel_on():
elif (globalflags.DataSource=='data'):
from RecExConfig.AutoConfiguration import GetRunNumber
runNum = GetRunNumber()
- if (runNum<222222):
+ if (runNum is None):
+ IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
+ elif (runNum<222222):
useCablingConditions = False
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
rodIDForSingleLink40=1300000
diff --git a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
index 8e4646f26a98..cf1b22541223 100644
--- a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
+++ b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
@@ -210,8 +210,8 @@ def ConfigureField():
if athenaCommonFlags.isOnline():
from RecExOnline.OnlineISConfiguration import GetBFields
Fields=GetBFields()
- solenoidCurrent=Fields[0]
- toroidCurrent=Fields[1]
+ solenoidCurrent=Fields[0].value
+ toroidCurrent=Fields[1].value
# offline running -> getting field from COOL
else:
solenoidCurrent,toroidCurrent=GetFieldFromCool()
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_postconfig.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_postconfig.py
index b07ae96f0a8e..58d12a6b2b7d 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_postconfig.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_postconfig.py
@@ -25,8 +25,6 @@ if isOnline and useEmon:
#ToolSvc.InDetCosmicsEventPhaseTool.GlobalOffset = 0
-ToolSvc.InDetPixelClusterOnTrackTool.ErrorStrategy=1 # Added 13 Jul 2020 from ATLASRECTS-5544
-
# ----------------------------- Printout
printfunc ("CHECK POINT PRINTING")
diff --git a/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py b/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py
index cb1eb0864003..42607059f5f4 100644
--- a/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py
+++ b/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py
@@ -10,8 +10,8 @@ isOfflineTest = False
#for the time being, running over file is not possible ONLINE (please see RecExOnline_File_Offline.py)
useEmon = True
-#The number of machines we run with helpfully labelled "keycount"
-keycount = 10 #10 #1000
+#The number of machines per single monitoring task we run with helpfully labelled "keycount"
+keycount = 2
buffersize = 10
updateperiod = 200
timeout = 600000
--
GitLab