diff --git a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/CMakeLists.txt
index 7f6834933e28e3a233ca4eca4427f14097572efe..cc1d7eda28f5dfa7693ff9035b5bae0cdd80537f 100644
--- a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/CMakeLists.txt
@@ -1,49 +1,16 @@
-################################################################################
-# Package: TrigMinBiasMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMinBiasMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthenaMonitoring
- Event/xAOD/xAODEventInfo
- ForwardDetectors/ZDC/ZdcIdentifier
- GaudiKernel
- InnerDetector/InDetRecTools/InDetTrackSelectionTool
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigMonitoring/TrigHLTMonitoring
- PRIVATE
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigMinBias
- Event/xAOD/xAODTrigger
- ForwardDetectors/LUCID/LUCID_RawEvent
- ForwardDetectors/ZDC/ZdcEvent
- InnerDetector/InDetRawEvent/InDetBCM_RawData
- TileCalorimeter/TileEvent
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent
- Control/AthenaMonitoringKernel )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
+find_package( ROOT COMPONENTS Core Hist )
# Component(s) in the package:
-atlas_add_library( TrigMinBiasMonitoringLib
- src/*.cxx
- PUBLIC_HEADERS TrigMinBiasMonitoring
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier xAODEventInfo ZdcIdentifier GaudiKernel AthenaMonitoringLib TrigDecisionToolLib TrigHLTMonitoringLib
- PRIVATE_LINK_LIBRARIES CaloEvent CaloGeoHelpers xAODTracking xAODTrigMinBias LUCID_RawEvent ZdcEvent InDetBCM_RawData TileEvent TrigCaloEvent TrigInDetEvent InDetTrackSelectionToolLib xAODTrigger AthenaMonitoringLib AthenaMonitoringKernelLib )
-
atlas_add_component( TrigMinBiasMonitoring
- src/components/*.cxx
+ src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaMonitoringLib xAODEventInfo ZdcIdentifier GaudiKernel TrigDecisionToolLib TrigHLTMonitoringLib CaloEvent CaloGeoHelpers xAODTracking xAODTrigMinBias LUCID_RawEvent ZdcEvent InDetBCM_RawData TileEvent TrigCaloEvent TrigInDetEvent TrigMinBiasMonitoringLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringKernelLib AthenaMonitoringLib CaloEvent CaloGeoHelpers CaloIdentifier GaudiKernel InDetBCM_RawData InDetTrackSelectionToolLib LUCID_RawEvent TileEvent TrigCaloEvent TrigDecisionToolLib TrigHLTMonitoringLib TrigInDetEvent ZdcEvent ZdcIdentifier xAODEventInfo xAODTracking xAODTrigMinBias xAODTrigger )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitCategory.py b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitCategory.py
index b1c07f725d5990b008536b78b95f9b1a304d014e..9461f67364d15e70727ffdeba972249ffd30c370 100644
--- a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitCategory.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#----NORMAL USER ACCESS-------
@@ -18,7 +18,7 @@ triggers_hi = [ "mb_sp",
"mb_perf_L1MBTS_1_1",
"noalg_mb_L1TE50",
]
-
+
# pPb triggers 2016
triggers_pPb = ["mb_sptrk",
#"mb_sptrk_noisesup",
@@ -38,7 +38,7 @@ triggers_pPb = ["mb_sptrk",
]
#!----NORMAL USER ACCESS-------
-
+
#----ADVANCED USER ACCESS-----
# PLEASE DO NOT MODIFY EXISTING CODE UNLESS YOU ARE PERFECTLY SURE WHAT YOU ARE DOING
@@ -59,15 +59,14 @@ for x in triggers_pPb:
triggersFiltered_pPb.append(x)
from RecExConfig.RecFlags import rec
-from AthenaCommon.BeamFlags import jobproperties
from AthenaCommon.Logging import logging
log = logging.getLogger( 'TrigMinBiasMonitoring' )
-if rec.doHeavyIon == True:
+if rec.doHeavyIon is True:
log.info('HI mode of min-bias trigger monitoring')
monitoring_minbias = triggersFiltered_hi
-elif rec.doHIP == True:
+elif rec.doHIP is True:
log.info('doHI mode of min-bias trigger monitoring')
monitoring_minbias = triggersFiltered_pPb
else:
diff --git a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitoringConfig.py b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitoringConfig.py
index 6c30fd39cd932db087a3ba1fe2b50f0c99f9087e..f9875624ee51320da892942531790b783d80870b 100644
--- a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitoringConfig.py
@@ -1,88 +1,77 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
def TrigMinBiasMonitoringTool():
- from AthenaCommon.AppMgr import ToolSvc
-
- #---CRITICAL---
- NOALG, MBTS, LUCID, IDMINBIAS, ZDC, BCM, HMT, ALL = 0, 1, 2, 4, 8, 16, 32, 63
- NOCUT, LOOSE, LOOSEPRIMARY, TIGHTPRIMARY = 0, 1, 2, 3
- PHYSICS, L1_ISPASSEDBEFOREPRESCALE = 0, 1
- #!---CRITICAL---
-
- from TrigMinBiasMonitoring.TrigMinBiasMonitoringConf import HLTMinBiasMonTool
- from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # access to central tool
-
- HLTMinBiasMon = HLTMinBiasMonTool(name = 'HLTMinBiasMon',
+
+ #---CRITICAL---
+ NOALG, MBTS, LUCID, IDMINBIAS, ZDC, BCM, HMT, ALL = 0, 1, 2, 4, 8, 16, 32, 63 # noqa: F841
+ NOCUT, LOOSE, LOOSEPRIMARY, TIGHTPRIMARY = 0, 1, 2, 3 # noqa: F841
+ PHYSICS, L1_ISPASSEDBEFOREPRESCALE = 0, 1
+ #!---CRITICAL---
+
+ from TrigMinBiasMonitoring.TrigMinBiasMonitoringConf import HLTMinBiasMonTool
+ from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # access to central tool
+
+ HLTMinBiasMon = HLTMinBiasMonTool(name = 'HLTMinBiasMon',
histoPathBase = "/Trigger/HLT",
SPContainerName = "HLT_xAOD__TrigSpacePointCountsContainer_spacepoints",
TCContainerName = "HLT_xAOD__TrigTrackCountsContainer_trackcounts",
T2MBTSContainerName = "HLT_xAOD__TrigT2MbtsBitsContainer_T2Mbts",
- VCContainerName = "HLT_xAOD__TrigVertexCountsContainer_vertexcounts",
- VColContainerName = "HLT_TrigVertexCollection_TrigL2SiTrackFinder_FullScan_ZF_Only",
+ VCContainerName = "HLT_xAOD__TrigVertexCountsContainer_vertexcounts",
+ VColContainerName = "HLT_TrigVertexCollection_TrigL2SiTrackFinder_FullScan_ZF_Only",
MBTSContainerName = "MBTSContainer",
BCMContainerName = "BCM_RDOs",
LUCID_RawDataContainerName = "Lucid_RawData",
ZDC_ContainerName = "ZdcRawChannelCollection",
Calo_ContainerName = "AllCalo",
- InDetTrackParticleContainerName = "InDetTrackParticles",
-
- monitoring_minbias = hltmonList.monitoring_minbias,
- MinBiasRefTrigItem = "mb_sptrk", # "mb_sptrk" should be used, "noalg_L1RD0_FILLED" for pp
+ InDetTrackParticleContainerName = "InDetTrackParticles",
+ monitoring_minbias = hltmonList.monitoring_minbias,
+ MinBiasRefTrigItem = "mb_sptrk", # "mb_sptrk" should be used, "noalg_L1RD0_FILLED" for pp
MinBiasAvailableAlgorithms = ['sp', 'sptrk', 'mbts', 'noalg', 'hmtperf', 'idperf', 'perf', 'hmt'], #the order here matters: more specific names should go before general eg. 'ideperf' before 'perf'...
MinBiasHistoTargets = [IDMINBIAS, IDMINBIAS, MBTS, 0, HMT, 0, MBTS + IDMINBIAS, HMT],
- IsPassedCondtitions = [PHYSICS, PHYSICS, PHYSICS, L1_ISPASSEDBEFOREPRESCALE, PHYSICS, PHYSICS, PHYSICS, PHYSICS],
- #CollectiveHistogramForAlgorithm = ['1', '1', '1', '1', '2', '2', '2', '3'],
- CollectiveHistogramForAlgorithm = ['1', '1', '1', '1', '1', '1', '1', '1'],
-
+ IsPassedCondtitions = [PHYSICS, PHYSICS, PHYSICS, L1_ISPASSEDBEFOREPRESCALE, PHYSICS, PHYSICS, PHYSICS, PHYSICS],
+ #CollectiveHistogramForAlgorithm = ['1', '1', '1', '1', '2', '2', '2', '3'],
+ CollectiveHistogramForAlgorithm = ['1', '1', '1', '1', '1', '1', '1', '1'],
MBTS_countsSideA = 12,
MBTS_countsSideC = 12
- );
-
- # ---------------------- InDetTrackSelectionTool
-
- #'mbts'
- HLTMinBiasMon.mbtsEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
-
- #'sptrk'
- HLTMinBiasMon.sptrkEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
-
- #'noalg'
- HLTMinBiasMon.noalgEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
+ )
+ # ---------------------- InDetTrackSelectionTool
- #'hmtperf'
- HLTMinBiasMon.hmtperfEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
+ #'mbts'
+ HLTMinBiasMon.mbtsEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
- #'idperf'
- HLTMinBiasMon.idperfEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
+ #'sptrk'
+ HLTMinBiasMon.sptrkEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
- #'perf'
- HLTMinBiasMon.perfEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
+ #'noalg'
+ HLTMinBiasMon.noalgEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
- #'hmt'
- HLTMinBiasMon.hmtEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
+ #'hmtperf'
+ HLTMinBiasMon.hmtperfEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
- #purity
- HLTMinBiasMon.PurityTrackSelectionTool.CutLevel = "LoosePrimary"
+ #'idperf'
+ HLTMinBiasMon.idperfEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
- # ---------------------- !InDetTrackSelectionTool
+ #'perf'
+ HLTMinBiasMon.perfEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
- # ---------------------- Collective Histograms Management
+ #'hmt'
+ HLTMinBiasMon.hmtEfficiencyTrackSelectionTool.CutLevel = "LoosePrimary"
- tmpList = []
- for i in range(len(HLTMinBiasMon.CollectiveHistogramForAlgorithm)):
- #for i in HLTMinBiasMon.CollectiveHistogramForAlgorithm:
- HLTMinBiasMon.CollectiveHistogramForAlgorithm[i] = HLTMinBiasMon.CollectiveHistogramForAlgorithm[i] if HLTMinBiasMon.CollectiveHistogramForAlgorithm[i] != '' else '_' #forces uniqueness
- if HLTMinBiasMon.CollectiveHistogramForAlgorithm[i] not in tmpList:
- tmpList.append(HLTMinBiasMon.CollectiveHistogramForAlgorithm[i]);
- HLTMinBiasMon.CollectiveHistogramsNames = tmpList
-
- # ---------------------- !Collective Histograms Management
-
- #ToolSvc += HLTMinBiasMon;
- list = [ HLTMinBiasMon ];
+ #purity
+ HLTMinBiasMon.PurityTrackSelectionTool.CutLevel = "LoosePrimary"
- return list
+ # ---------------------- !InDetTrackSelectionTool
+ # ---------------------- Collective Histograms Management
+ tmpList = []
+ for i in range(len(HLTMinBiasMon.CollectiveHistogramForAlgorithm)):
+ #for i in HLTMinBiasMon.CollectiveHistogramForAlgorithm:
+ HLTMinBiasMon.CollectiveHistogramForAlgorithm[i] = HLTMinBiasMon.CollectiveHistogramForAlgorithm[i] if HLTMinBiasMon.CollectiveHistogramForAlgorithm[i] != '' else '_' #forces uniqueness
+ if HLTMinBiasMon.CollectiveHistogramForAlgorithm[i] not in tmpList:
+ tmpList.append(HLTMinBiasMon.CollectiveHistogramForAlgorithm[i])
+ HLTMinBiasMon.CollectiveHistogramsNames = tmpList
+ list = [ HLTMinBiasMon ]
+ return list
diff --git a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/HLTMinBiasMonTool.cxx b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/HLTMinBiasMonTool.cxx
index 614faf670aad303739805a76005aa0ef2b7f0337..38bea459b2ea839b99616d65cdc2a9c8d0ba0e07 100755
--- a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/HLTMinBiasMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/HLTMinBiasMonTool.cxx
@@ -25,7 +25,7 @@
*
* Based on HLTMonTool example by Christiane Risler and Martin zur Nedden
*/
-#include "TrigMinBiasMonitoring/HLTMinBiasMonTool.h"
+#include "HLTMinBiasMonTool.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "AthenaMonitoring/AthenaMonManager.h"
diff --git a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/TrigMinBiasMonitoring/HLTMinBiasMonTool.h b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/HLTMinBiasMonTool.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigMonitoring/TrigMinBiasMonitoring/TrigMinBiasMonitoring/HLTMinBiasMonTool.h
rename to Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/HLTMinBiasMonTool.h
diff --git a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/components/TrigMinBiasMonitoring_entries.cxx b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/components/TrigMinBiasMonitoring_entries.cxx
index 5025c37c77647da4b526fe43349520f420b7ec05..cc70eab34a741449b66cdf372c729cadd782faa8 100644
--- a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/components/TrigMinBiasMonitoring_entries.cxx
+++ b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/components/TrigMinBiasMonitoring_entries.cxx
@@ -1,4 +1,4 @@
-#include "TrigMinBiasMonitoring/HLTMinBiasMonTool.h"
+#include "../HLTMinBiasMonTool.h"
#include "../HLTMinBiasMonAlgMT.h"