From aaafb19c139fa39a42eacea492e305cfdf977645 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso Diaz <alejandro.alonso@cern.ch>
Date: Fri, 16 Dec 2016 16:10:02 +0100
Subject: [PATCH] OBO of A. Kastanas. Fix config. for ATLASRECTS-3305
(InDetRecExample-02-06-08-07)
* OBO Alex Kastanas. InDet Monitoring configuration for
InDetGlobalMonitoring-00-10-00 new setup.
* Tagging as InDetRecExample-02-06-08-07
2016-12-15 Per Johansson
* Updated the Pixel DCS module status flags in InDetRecConditionsAccess.py
* Tagging as InDetRecExample-02-06-08-06
Former-commit-id: 092449cf22afb629a1b051c24f853dfa57893a08
---
.../share/InDetMonitoringGlobal.py | 29 ++++++++++---------
.../share/InDetRecConditionsAccess.py | 4 +--
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py
index 77077140a1f8..e4d1d00a78e8 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py
@@ -68,22 +68,25 @@ if InDetFlags.doMonitoringGlobal():
TrackCollection = InDetKeys.UnslimmedTracks()
- InDetTrackSelectionToolGlobalMon_LoosePrimary = InDet__InDetTrackSelectionTool(name = "InDetTrackSelectionToolGlobalMon_LoosePrimary",
+ InDetTrackSelectionToolGlobalMon_Baseline = InDet__InDetTrackSelectionTool(name = "InDetTrackSelectionToolGlobalMon_Baseline",
UseTrkTrackTools = True,
- CutLevel = "LoosePrimary",
+ CutLevel = "TightPrimary",
+ maxNPixelHoles = 1,
+ minPt = 5000,
TrackSummaryTool = InDetTrackSummaryTool,
Extrapolator = InDetExtrapolator)
InDetTrackSelectionToolGlobalMon_TightPrimary = InDet__InDetTrackSelectionTool(name = "InDetTrackSelectionToolGlobalMon_TightPrimary",
UseTrkTrackTools = True,
CutLevel = "TightPrimary",
+ minPt = 5000,
TrackSummaryTool = InDetTrackSummaryTool,
Extrapolator = InDetExtrapolator)
- ToolSvc += InDetTrackSelectionToolGlobalMon_LoosePrimary
+ ToolSvc += InDetTrackSelectionToolGlobalMon_Baseline
ToolSvc += InDetTrackSelectionToolGlobalMon_TightPrimary
- InDetGlobalTrackMonTool.LoosePrimary_SelTool = InDetTrackSelectionToolGlobalMon_LoosePrimary
+ InDetGlobalTrackMonTool.Baseline_SelTool = InDetTrackSelectionToolGlobalMon_Baseline
InDetGlobalTrackMonTool.Tight_SelTool = InDetTrackSelectionToolGlobalMon_TightPrimary
if DQMonFlags.monManDataType == 'heavyioncollisions' or InDetFlags.doHeavyIon() == True:
@@ -121,14 +124,14 @@ if InDetFlags.doMonitoringGlobal():
# BCM TOOL #
# #
####################################################
- from InDetGlobalMonitoring.InDetGlobalMonitoringConf import InDetGlobalBCMTool
- InDetGlobalBCMTool=InDetGlobalBCMTool( name = "InDetGlobalBCMTool")
+ # from InDetGlobalMonitoring.InDetGlobalMonitoringConf import InDetGlobalBCMTool
+ # InDetGlobalBCMTool=InDetGlobalBCMTool( name = "InDetGlobalBCMTool")
- if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetGlobalBCMTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc += InDetGlobalBCMTool
- if (InDetFlags.doPrintConfigurables()):
- print InDetGlobalBCMTool
+ # if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
+ # InDetGlobalBCMTool.FilterTools.append(monFilledBunchFilterTool)
+ # ToolSvc += InDetGlobalBCMTool
+ # if (InDetFlags.doPrintConfigurables()):
+ # print InDetGlobalBCMTool
####################################################
# #
@@ -155,8 +158,8 @@ if InDetFlags.doMonitoringGlobal():
# #
####################################################
InDetGlobalManager.AthenaMonTools += [ InDetGlobalSynchMonTool,
- InDetGlobalTrackMonTool,
- InDetGlobalBCMTool]
+ InDetGlobalTrackMonTool]
+ # InDetGlobalBCMTool taken out (AK 2016/12/16)
if DetFlags.haveRIO.pixel_on():
InDetGlobalManager.AthenaMonTools += [ InDetGlobalPixelTool ]
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index 3bf4ce70ffe0..84530110a04c 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -100,8 +100,8 @@ if DetFlags.haveRIO.pixel_on():
# temporarily workaround incomplete conditions data for MC
# by only enabling the usage of dcs in the pixel conditions summary service for data
InDetPixelConditionsSummarySvc.UseDCS = isData
- InDetPixelConditionsSummarySvc.IsActiveStates = [ 'READY' ]
- InDetPixelConditionsSummarySvc.IsActiveStatus = [ 'OK', 'WARNING' ]
+ InDetPixelConditionsSummarySvc.IsActiveStates = [ 'READY', 'ON', 'UNKNOWN', 'TRANSITION', 'UNDEFINED' ]
+ InDetPixelConditionsSummarySvc.IsActiveStatus = [ 'OK', 'WARNING', 'ERROR', 'FATAL' ]
# Force Lorentz angle calculation to use DCS for data
if (globalflags.DataSource() == 'data'):
pixelLorentzAngleSvcSetup.forceUseDB()
--
GitLab