diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py index 77077140a1f88bacbdb7395e924f3d15b24db688..e4d1d00a78e890ca734f8b136cc72f21e9b01e5b 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 3bf4ce70ffe0f8141d972fdde105117916eb6cfc..84530110a04c311bcf9df1e958b5a0084a183547 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()