diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt
index 340bff10e200dacc29858731146b31815d75bf74..b5617482676d9e88c8b89ba4d8f878505e73575e 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt
@@ -1,38 +1,8 @@
-################################################################################
-# Package: TrigT2MinBias
-###############################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigT2MinBias )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Event/xAOD/xAODTrigMinBias
- ForwardDetectors/ZDC/ZdcEvent
- GaudiKernel
- TileCalorimeter/TileEvent
- Trigger/TrigAlgorithms/TrigT2CaloCommon
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigSteer/DecisionHandling
- Trigger/TrigSteer/TrigCompositeUtils
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigTools/TrigInDetToolInterfaces
- DetectorDescription/IRegionSelector
- Event/xAOD/xAODEventInfo
- ForwardDetectors/ZDC/ZdcConditions
- ForwardDetectors/ZDC/ZdcIdentifier
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetRawEvent/InDetRawData
- InnerDetector/InDetRecEvent/InDetPrepRawData
- TileCalorimeter/TileIdentifier
- Tracking/TrkEvent/TrkSpacePoint
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigTools/TrigTimeAlgs
- Event/xAOD/xAODTrigger
- Control/AthenaMonitoringKernel
- Control/AthViews )
-
# External dependencies:
find_package( tdaq-common )
@@ -40,9 +10,7 @@ find_package( tdaq-common )
atlas_add_component( TrigT2MinBias
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} DecisionHandlingLib xAODTrigger xAODTrigMinBias ZdcEvent GaudiKernel TileEvent TrigT2CaloCommonLib TrigCaloEvent TrigInDetEvent TrigInterfacesLib IRegionSelector xAODEventInfo ZdcConditions ZdcIdentifier InDetIdentifier InDetRawData InDetPrepRawData TileIdentifier TrkSpacePoint TrigSteeringEvent TrigTimeAlgsLib AthViews TrigCompositeUtilsLib)
-
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthViews AthenaBaseComps AthenaMonitoringKernelLib CaloEvent CaloIdentifier DecisionHandlingLib GaudiKernel IRegionSelector InDetIdentifier InDetPrepRawData InDetRawData StoreGateLib TileByteStreamLib TileConditionsLib TileEvent TileIdentifier TrigCaloEvent TrigCompositeUtilsLib TrigInDetEvent TrigInDetToolInterfacesLib TrigInterfacesLib TrigSteeringEvent TrigT2CaloCommonLib TrigTimeAlgsLib TrkSpacePoint ZdcConditions ZdcEvent ZdcIdentifier xAODEventInfo xAODTrigMinBias xAODTrigger )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/MbtsConfig.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/MbtsConfig.py
index a6c2270a7c486b4979344f027c4013af23be24d4..efd8baa3af5ed6ce80c0e5590dab1757b4d170cb 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/MbtsConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/MbtsConfig.py
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from TrigT2MinBias.TrigT2MinBiasConf import MbtsFexMT
from TrigT2MinBias.TrigT2MinBiasMonitoringMT import MbtsFexMTMonitoring
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
index 922b5d7cae532351f3323d8b8ac1adec280e5b4f..f72969c45a86fb1bd02add9fa56b466876be15a0 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# -*- coding: utf-8 -*-
from TrigT2MinBias.TrigT2MinBiasConf import T2ZdcFex, T2ZdcHypo
from TrigT2MinBias.TrigT2MinBiasConf import T2MbtsFex, T2MbtsHypo
from TrigT2MinBias.TrigT2MinBiasConf import TrigCountSpacePoints, TrigCountSpacePointsHypo
-from TrigT2MinBias.TrigT2MinBiasConf import TrigCountTrtHits, TrigCountTrtHitsHypo
# Monitoring
from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
@@ -13,10 +12,6 @@ from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
# Properties for histogram dimensions
from TrigT2MinBias.TrigT2MinBiasProperties import trigT2MinBiasProperties
-from AthenaCommon.AppMgr import ToolSvc
-
-#ToolSvc += ospTool
-
fexes = {}
hypos = {}
@@ -1318,82 +1313,82 @@ fexes["L2MbZdcFex_LG"] = L2MbZdcFex_LG
class ZdcHypoMonitoring(TrigGenericMonitoringToolConfig):
- def __init__ (self, name="ZdcHypoMonitoring"):
- super(ZdcHypoMonitoring, self).__init__(name)
- self.defineTarget( ["Online", "Validation", "Cosmic"])
-
-
- self.Histograms += [ defineHistogram('MultiplicityZDC_A',
- type = 'TH1I',
- title = "Num ZDC Modules Side A",
- xbins = 5, xmin=-0.5, xmax=5.5)]
-
- self.Histograms += [ defineHistogram('MultiplicityZDC_C',
- type = 'TH1I',
- title = "Num ZDC Modules Side C",
- xbins = 5, xmin=-0.5, xmax=5.5)]
-
- self.Histograms += [ defineHistogram('TimeZDC_A',
- type = 'TH1F',
- title = "ZDC Mean Time Side A",
- xbins = 100, xmin=-10, xmax=10)]
-
- self.Histograms += [ defineHistogram('TimeZDC_C',
- type = 'TH1F',
- title = "ZDC Mean Time Side C",
- xbins = 100, xmin=-10, xmax=10)]
-
- self.Histograms += [ defineHistogram('SumEnergyZDC_A',
- type = 'TH1F',
- title = "ZDC Sum Energy Side A",
- xbins = 500, xmin=0, xmax=5000)]
-
- self.Histograms += [ defineHistogram('SumEnergyZDC_C',
- type = 'TH1F',
- title = "ZDC Sum Energy Side C",
- xbins = 500, xmin=0, xmax=5000)]
-
- self.Histograms += [ defineHistogram('TimeDiff_A_C',
- type = 'TH1F',
- title = "ZDC Time Diff (A-C)",
- xbins = 100, xmin=-10, xmax=10)]
+ def __init__ (self, name="ZdcHypoMonitoring"):
+ super(ZdcHypoMonitoring, self).__init__(name)
+ self.defineTarget( ["Online", "Validation", "Cosmic"])
+
+
+ self.Histograms += [ defineHistogram('MultiplicityZDC_A',
+ type = 'TH1I',
+ title = "Num ZDC Modules Side A",
+ xbins = 5, xmin=-0.5, xmax=5.5)]
+
+ self.Histograms += [ defineHistogram('MultiplicityZDC_C',
+ type = 'TH1I',
+ title = "Num ZDC Modules Side C",
+ xbins = 5, xmin=-0.5, xmax=5.5)]
+
+ self.Histograms += [ defineHistogram('TimeZDC_A',
+ type = 'TH1F',
+ title = "ZDC Mean Time Side A",
+ xbins = 100, xmin=-10, xmax=10)]
+
+ self.Histograms += [ defineHistogram('TimeZDC_C',
+ type = 'TH1F',
+ title = "ZDC Mean Time Side C",
+ xbins = 100, xmin=-10, xmax=10)]
+
+ self.Histograms += [ defineHistogram('SumEnergyZDC_A',
+ type = 'TH1F',
+ title = "ZDC Sum Energy Side A",
+ xbins = 500, xmin=0, xmax=5000)]
+
+ self.Histograms += [ defineHistogram('SumEnergyZDC_C',
+ type = 'TH1F',
+ title = "ZDC Sum Energy Side C",
+ xbins = 500, xmin=0, xmax=5000)]
+
+ self.Histograms += [ defineHistogram('TimeDiff_A_C',
+ type = 'TH1F',
+ title = "ZDC Time Diff (A-C)",
+ xbins = 100, xmin=-10, xmax=10)]
# after selection
- self.Histograms += [ defineHistogram('SelMultiplicityZDC_A',
- type = 'TH1I',
- title = "Num ZDC Modules Side A (After)",
- xbins = 5, xmin=-0.5, xmax=5.5)]
+ self.Histograms += [ defineHistogram('SelMultiplicityZDC_A',
+ type = 'TH1I',
+ title = "Num ZDC Modules Side A (After)",
+ xbins = 5, xmin=-0.5, xmax=5.5)]
- self.Histograms += [ defineHistogram('SelMultiplicityZDC_C',
- type = 'TH1I',
- title = "Num ZDC Modules Side C (After)",
- xbins = 5, xmin=-0.5, xmax=5.5)]
+ self.Histograms += [ defineHistogram('SelMultiplicityZDC_C',
+ type = 'TH1I',
+ title = "Num ZDC Modules Side C (After)",
+ xbins = 5, xmin=-0.5, xmax=5.5)]
- self.Histograms += [ defineHistogram('SelTimeZDC_A',
- type = 'TH1F',
- title = "ZDC Mean Time Side A (After)",
- xbins = 100, xmin=-10, xmax=10)]
+ self.Histograms += [ defineHistogram('SelTimeZDC_A',
+ type = 'TH1F',
+ title = "ZDC Mean Time Side A (After)",
+ xbins = 100, xmin=-10, xmax=10)]
- self.Histograms += [ defineHistogram('SelTimeZDC_C',
- type = 'TH1F',
- title = "ZDC Mean Time Side C (After)",
- xbins = 100, xmin=-10, xmax=10)]
+ self.Histograms += [ defineHistogram('SelTimeZDC_C',
+ type = 'TH1F',
+ title = "ZDC Mean Time Side C (After)",
+ xbins = 100, xmin=-10, xmax=10)]
- self.Histograms += [ defineHistogram('SelSumEnergyZDC_A',
- type = 'TH1F',
- title = "ZDC Sum Energy Side A (After)",
- xbins = 500, xmin=0, xmax=5000)]
+ self.Histograms += [ defineHistogram('SelSumEnergyZDC_A',
+ type = 'TH1F',
+ title = "ZDC Sum Energy Side A (After)",
+ xbins = 500, xmin=0, xmax=5000)]
- self.Histograms += [ defineHistogram('SelSumEnergyZDC_C',
- type = 'TH1F',
- title = "ZDC Sum Energy Side C (After)",
- xbins = 500, xmin=0, xmax=5000)]
+ self.Histograms += [ defineHistogram('SelSumEnergyZDC_C',
+ type = 'TH1F',
+ title = "ZDC Sum Energy Side C (After)",
+ xbins = 500, xmin=0, xmax=5000)]
- self.Histograms += [ defineHistogram('SelTimeDiff_A_C',
- type = 'TH1F',
- title = "ZDC Time Diff (A-C) (After)",
- xbins = 100, xmin=-10, xmax=10)]
+ self.Histograms += [ defineHistogram('SelTimeDiff_A_C',
+ type = 'TH1F',
+ title = "ZDC Time Diff (A-C) (After)",
+ xbins = 100, xmin=-10, xmax=10)]
@@ -1413,11 +1408,11 @@ L2MbZdcHypo_PT.TimeLogic = 0
L2MbZdcHypo_PT.EnergyLogic = 1
L2MbZdcHypo_PT.MultiplicityLogic = 0
L2MbZdcHypo_PT.TimeOffset = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_PT.Pedestal = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_PT.EnergyCalibration = [1., 1., 1., 1.,
- 1., 1., 1., 1.]
+ 1., 1., 1., 1.]
L2MbZdcHypo_PT.TimeModuleCut = 99999.
L2MbZdcHypo_PT.SumEnergyCut = [-1., 99999., -1., 99999.]
L2MbZdcHypo_PT.MultCut = [ -1 , -1 ]
@@ -1431,11 +1426,11 @@ L2MbZdcHypo_hip_low_sideA.TimeLogic = 0
L2MbZdcHypo_hip_low_sideA.EnergyLogic = 2 ## OR
L2MbZdcHypo_hip_low_sideA.MultiplicityLogic = 0
L2MbZdcHypo_hip_low_sideA.TimeOffset = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_low_sideA.Pedestal = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_low_sideA.EnergyCalibration = [1., 1., 1., 1.,
- 1., 1., 1., 1.]
+ 1., 1., 1., 1.]
L2MbZdcHypo_hip_low_sideA.TimeModuleCut = 99999.
L2MbZdcHypo_hip_low_sideA.SumEnergyCut = [180., 99999., 99999., -1] # 1<A<2 || 3<C<4
L2MbZdcHypo_hip_low_sideA.MultCut = [ -1 , -1 ]
@@ -1450,11 +1445,11 @@ L2MbZdcHypo_hip_low_sideC.TimeLogic = 0
L2MbZdcHypo_hip_low_sideC.EnergyLogic = 2 ## OR
L2MbZdcHypo_hip_low_sideC.MultiplicityLogic = 0
L2MbZdcHypo_hip_low_sideC.TimeOffset = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_low_sideC.Pedestal = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_low_sideC.EnergyCalibration = [1., 1., 1., 1.,
- 1., 1., 1., 1.]
+ 1., 1., 1., 1.]
L2MbZdcHypo_hip_low_sideC.TimeModuleCut = 99999.
L2MbZdcHypo_hip_low_sideC.SumEnergyCut = [99999.,-1., 180., 99999.] # 1<A<2 || 3<C<4
L2MbZdcHypo_hip_low_sideC.MultCut = [ -1 , -1 ]
@@ -1469,11 +1464,11 @@ L2MbZdcHypo_hip_hi_sideA.TimeLogic = 0
L2MbZdcHypo_hip_hi_sideA.EnergyLogic = 2 ## OR
L2MbZdcHypo_hip_hi_sideA.MultiplicityLogic = 0
L2MbZdcHypo_hip_hi_sideA.TimeOffset = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_hi_sideA.Pedestal = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_hi_sideA.EnergyCalibration = [1., 1., 1., 1.,
- 1., 1., 1., 1.]
+ 1., 1., 1., 1.]
L2MbZdcHypo_hip_hi_sideA.TimeModuleCut = 99999.
L2MbZdcHypo_hip_hi_sideA.SumEnergyCut = [300., 99999., 99999., -1.] # 1<A<2 || 3<C<4
L2MbZdcHypo_hip_hi_sideA.MultCut = [ -1 , -1 ]
@@ -1488,11 +1483,11 @@ L2MbZdcHypo_hip_hi_sideC.TimeLogic = 0
L2MbZdcHypo_hip_hi_sideC.EnergyLogic = 2 ## OR
L2MbZdcHypo_hip_hi_sideC.MultiplicityLogic = 0
L2MbZdcHypo_hip_hi_sideC.TimeOffset = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_hi_sideC.Pedestal = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_hi_sideC.EnergyCalibration = [1., 1., 1., 1.,
- 1., 1., 1., 1.]
+ 1., 1., 1., 1.]
L2MbZdcHypo_hip_hi_sideC.TimeModuleCut = 99999.
L2MbZdcHypo_hip_hi_sideC.SumEnergyCut = [99999.,-1., 300., 99999.] # 1<A<2 || 3<C<4
L2MbZdcHypo_hip_hi_sideC.MultCut = [ -1 , -1 ]
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
index 3da6332aeadad56300da18f9aa33f9f78803e344..e91b8a45cf1025789b76a4e4cd7e791e5d56da84 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
def SpCountMonitoring():
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
index 706bb1496181b278ff04233ea9fc3ef659cdd6c9..35d055629aa7786b4af1fcfd5a2ef4ba95e51a5e 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.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
##
## @file Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
@@ -19,7 +19,6 @@ __all__ = [ "trigT2MinBiasProperties" ]
## Import
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
-from AthenaCommon.JobProperties import jobproperties
##-----------------------------------------------------------------------------
## 1st step: define JobProperty classes
@@ -114,8 +113,8 @@ log = logging.getLogger( 'TrigT2MinBiasProperties.py' )
try:
from TriggerMenu import useNewTriggerMenu
useNewTM = useNewTriggerMenu()
- log.info("Using new TriggerMenu: %r" % useNewTM)
-except:
+ log.info("Using new TriggerMenu: %r", useNewTM)
+except Exception:
useNewTM = False
log.info("Using old TriggerMenuPython since TriggerMenu.useNewTriggerMenu can't be imported")