diff --git a/Trigger/TrigMonitoring/TrigCaloMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigCaloMonitoring/CMakeLists.txt
index 389e23424de0df25f939c6178792f962a63cd7d1..eac47a13aca45e3e5ff8e23d9e1ddec52c788ab4 100644
--- a/Trigger/TrigMonitoring/TrigCaloMonitoring/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigCaloMonitoring/CMakeLists.txt
@@ -1,47 +1,17 @@
-################################################################################
-# Package: TrigCaloMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigCaloMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- LArCalorimeter/LArRecEvent
- Trigger/TrigMonitoring/TrigHLTMonitoring
- PRIVATE
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Control/StoreGate
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODTrigCalo
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArCabling
- LumiBlock/LumiBlockData
- Reconstruction/egamma/egammaEvent
- Trigger/TrigAlgorithms/TrigCaloRec
- Trigger/TrigAlgorithms/TrigT2CaloCommon
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigAnalysis/TrigAnalysisInterfaces
- Control/AthenaMonitoring )
-
# 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_component( TrigCaloMonitoring
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel LArRecEvent TrigHLTMonitoringLib StoreGateLib
- LArCablingLib TrigCaloRecLib TrigT2CaloCommonLib CaloEvent CaloGeoHelpers CaloIdentifier
- LArIdentifier egammaEvent TrigCaloEvent TrigSteeringEvent AthenaMonitoringLib xAODTrigCalo xAODCaloEvent)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringKernelLib AthenaMonitoringLib CaloEvent CaloGeoHelpers CaloIdentifier CaloInterfaceLib GaudiKernel LArCablingLib LArIdentifier LArRecEvent LumiBlockData StoreGateLib TrigCaloEvent TrigCaloRecLib TrigHLTMonitoringLib TrigSteeringEvent TrigT2CaloCommonLib egammaEvent xAODCaloEvent xAODTrigCalo )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
-atlas_install_headers( TrigCaloMonitoring )
-
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
index 4c6582517f14a35cb24013a805e9a50ab2c4a122..4dceac4efa05d78dd0a87dfd1701925c651ea752 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
@@ -1,61 +1,21 @@
-################################################################################
-# Package: TrigEgammaMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigEgammaMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODJet
- Event/xAOD/xAODPrimitives
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigCalo
- Event/xAOD/xAODTrigEgamma
- Event/xAOD/xAODTrigRinger
- Event/xAOD/xAODTrigger
- Event/xAOD/xAODTruth
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODCaloRings
- LumiBlock/LumiBlockComps
- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
- Reconstruction/RecoTools/RecoToolInterfaces
- Reconstruction/egamma/egammaMVACalib
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigAnalysis/TrigEgammaAnalysisTools
- Trigger/TrigAnalysis/TrigEgammaMatchingTool
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigMonitoring/TrigHLTMonitoring
- PhysicsAnalysis/AnalysisCommon/PATCore
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- Control/StoreGate
- GaudiKernel
- Trigger/TrigConfiguration/TrigConfxAOD )
# External dependencies:
find_package( Boost )
-find_package( ROOT COMPONENTS Core Hist Tree )
-
+# Component(s) in the package:
atlas_add_component( TrigEgammaMonitoring
src/*.h
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AsgTools xAODCaloEvent xAODMissingET xAODEgamma xAODEventInfo xAODJet xAODTracking xAODTrigCalo xAODTrigEgamma xAODTrigRinger xAODCaloRings xAODTrigger xAODTruth LumiBlockCompsLib ElectronPhotonSelectorToolsLib egammaMVACalibLib TrigDecisionToolLib TrigEgammaMatchingToolLib TrigConfHLTData TrigSteeringEvent TrigHLTMonitoringLib AthenaBaseComps AthenaMonitoringLib StoreGateLib SGtests GaudiKernel PATCoreLib TrigEgammaAnalysisToolsLib)
-
-# Install files from the package:
-
-
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES AthenaMonitoringKernelLib AthenaMonitoringLib EgammaAnalysisInterfacesLib GaudiKernel PATCoreLib StoreGateLib TrigConfxAODLib TrigDecisionToolLib TrigEgammaAnalysisToolsLib TrigEgammaMatchingToolLib xAODEgamma xAODEventInfo xAODJet xAODMissingET xAODTracking xAODTrigCalo xAODTrigEgamma xAODTrigger xAODTruth )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
index cb499a2560b940a05a3f7b7ec8dd581e484bc237..6ee9f233a0c0333e8c6e2ed4a6bdbf04314d0a13 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
@@ -1,6 +1,6 @@
#! /usr/bin/env python
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# -*- coding: utf-8 -*-
# vim:fenc=utf-8
#
@@ -14,6 +14,8 @@
# Provide all triggers to be monitored
# Provide list of categories and shifter plots
+# flake8: noqa (obsolete code)
+
# Provide function that is called by HLTMonitoring
# Returns the name of tool in ToolSvc
def TrigEgammaMonitoringTool(**kwargs):
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigHLTMonitoring/CMakeLists.txt
index 3124dfe2d135c53d284e7734dcc4177fac2f0f05..7eda997ed99d1a568b0a4f76392ecb519c8f7880 100644
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/CMakeLists.txt
@@ -1,47 +1,30 @@
-################################################################################
-# Package: TrigHLTMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigHLTMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaMonitoring
- Control/StoreGate
- Event/xAOD/xAODLuminosity
- GaudiKernel
- LumiBlock/LumiCalc
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- Control/AthenaKernel
- Event/EventInfo
- Event/xAOD/xAODTrigger )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-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( Boost COMPONENTS regex )
+find_package( ROOT COMPONENTS Core Tree Hist )
find_package( cx_Oracle )
# Component(s) in the package:
atlas_add_library( TrigHLTMonitoringLib
src/*.cxx
PUBLIC_HEADERS TrigHLTMonitoring
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES xAODLuminosity GaudiKernel TrigSteeringEvent AthenaMonitoringLib StoreGateLib SGtests LumiBlockCoolQuery TrigDecisionToolLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel EventInfo xAODTrigger )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES AthenaMonitoringLib GaudiKernel LumiBlockCoolQuery StoreGateLib TrigConfInterfaces TrigDecisionToolLib xAODLuminosity
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel AthenaMonitoringKernelLib EventInfo TrigSteeringEvent xAODTrigger )
atlas_add_component( TrigHLTMonitoring
src/components/*.cxx
LINK_LIBRARIES TrigHLTMonitoringLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
atlas_install_scripts( python/scripts/*.py python/scripts/*.sh java/TrigMaMGUI_TRIGGERDBREPR.sh )
-atlas_install_runtime(run/TrigHLTMon_tf.py)
+atlas_install_runtime( run/TrigHLTMon_tf.py )
atlas_install_generic( java/GUI/TrigMaMGUI.java
DESTINATION java/
TYPEANAME JavaGUI )
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonFlags.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonFlags.py
index fe370bff5fe95da4394f3aa97876ef92a8949c72..ff31c5d9a8e50289fb971ca93e3c20d86904a237 100644
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonFlags.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonFlags.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
## HLTFlags... taken from DQMonFlags ..
@@ -150,14 +150,12 @@ list+=[doOfflineTauTTP]
#create a JobProperty container
class HLTMonFlagsCont(JobPropertyContainer):
- """
- Container for HLT Monitoring FLags
- """
- def set_All_Off(self):
- for j in list:
- if j.__name__.startswith('do'):
- j.StoredValue=False
- pass
+ """Container for HLT Monitoring Flags"""
+ def set_All_Off(self):
+ for j in list:
+ if j.__name__.startswith('do'):
+ j.StoredValue=False
+
jobproperties.add_Container(HLTMonFlagsCont)
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonTriggerList.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonTriggerList.py
index 017ad7b3ab3a0d6399428e088bda8930cbe15fde..68544140eb08d2db70f4d4bf0fbc89b7b3ac15e2 100644
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonTriggerList.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonTriggerList.py
@@ -11,13 +11,7 @@ import TrigMinBiasMonitoring.TrigMinBiasMonitCategory as minbias
import TrigMuonMonitoring.TrigMuonMonitCategory as muon
import TrigTauMonitoring.TrigTauMonitCategory as tau
-if not 'jobproperties' in dir():
- from AthenaCommon.BeamFlags import jobproperties
-
-if not 'rec' in dir():
- from RecExConfig.RecFlags import rec
-
-if not 'DQMonFlags' in dir():
+if 'DQMonFlags' not in dir():
from AthenaMonitoring.DQMonFlags import DQMonFlags
class HLTMonTriggerList:
@@ -77,23 +71,23 @@ class HLTMonTriggerList:
self._get_monitoring_mode_success = self.get_monitoring_mode()
- if self._get_monitoring_mode_success == False:
+ if self._get_monitoring_mode_success is False:
# what should be done in this case?
print ("HLTMonTriggerList: Error getting monitoring mode, default monitoring lists will be used.")
- elif self.pp_mode == True:
+ elif self.pp_mode is True:
print ("HLTMonTriggerList: Setting up pp monitoring.")
self.set_HLTMonTrigList_pp()
- elif self.mc_mode == True:
+ elif self.mc_mode is True:
print ("HLTMonTriggerList: Setting up MC monitoring.")
self.set_HLTMonTrigList_mc()
- elif self.HI_mode == True:
+ elif self.HI_mode is True:
print ("HLTMonTriggerList: Setting up HI monitoring.")
self.set_HLTMonTrigList_HI()
- elif self.cosmic_mode == True:
+ elif self.cosmic_mode is True:
print ("HLTMonTriggerList: Setting up cosmic monitoring.")
self.set_HLTMonTrigList_cosmic()
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/MenuAwareMonitoring.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/MenuAwareMonitoring.py
index 8032def4d5bca4a224d4118574cf1b2ba656b970..7cc3e4e7943ab3869d3551fa1dea8b10afd6eb81 100644
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/MenuAwareMonitoring.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/MenuAwareMonitoring.py
@@ -3,6 +3,8 @@
# Authors: Ben Smart (ben.smart@cern.ch), Xanthe Hoad (xanthe.hoad@cern.ch)
# See https://twiki.cern.ch/twiki/bin/view/Atlas/MaDQM for more information
+# flake8: noqa (obsolete code)
+
from __future__ import print_function
import sys,os,shutil,re
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/MenuAwareMonitoringStandalone.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/MenuAwareMonitoringStandalone.py
index 7b488662b884cfafca1e1bc3ea6364923971751e..f7884c9d7b335b97e7f937cd1930e26dffee478a 100644
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/MenuAwareMonitoringStandalone.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/MenuAwareMonitoringStandalone.py
@@ -4,6 +4,8 @@
# Authors: Ben Smart (ben.smart@cern.ch), Xanthe Hoad (xanthe.hoad@cern.ch)
# See https://twiki.cern.ch/twiki/bin/view/Atlas/MaDQM for more information
+# flake8: noqa (obsolete code)
+
from __future__ import print_function
import sys,os
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/OracleInterface.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/OracleInterface.py
index a1372ede7375773c5570a9d5daa825095e0c1f31..bb6303afac9719144f87f4fa625e3237c5a06a85 100644
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/OracleInterface.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/OracleInterface.py
@@ -5,7 +5,6 @@
from __future__ import print_function
-import sys
# needed for oracle database connection
import cx_Oracle
# for converting configuration dictionaries into strings (for storing in the database as CLOB) and vice versa
@@ -61,7 +60,7 @@ class OracleInterface:
# where unicode is found, convert it to str
if type(input1) is str:
return input1
- elif type(input1) is unicode:
+ elif type(input1) is unicode: # noqa: F821 (obsolete code)
return str(input1)
elif type(input1) is list:
for n, item in enumerate(input1):
@@ -92,7 +91,7 @@ class OracleInterface:
listvalue[x] = self.__unicode_to_str__(json.loads(value[x].read()))
value = tuple(listvalue)
result.append(value)
- except:
+ except Exception:
for value in self.cursor.result:
if len(value) > 1:
listvalue = list(value)
@@ -111,7 +110,7 @@ class OracleInterface:
try:
self.cursor.execute(query,parameters_dict)
self.conn.commit()
- except:
+ except Exception:
print ("Insert into DB failed. Your connection is probably of the wrong type")
@@ -669,7 +668,7 @@ class OracleInterface:
# return the return list
return return_list
- except:
+ except Exception:
print ("Cannot get database table and column names. Your database connection is probably of the wrong type.")
@@ -792,7 +791,7 @@ class OracleInterface:
for smk in results:
smk_ids.append(smk[0])
smk_ids.sort()
- if print_list==True:
+ if print_list is True:
for smk in smk_ids:
print (smk)
return smk_ids
@@ -806,7 +805,7 @@ class OracleInterface:
for mck in results:
mck_ids.append(mck[0])
mck_ids.sort()
- if print_list==True:
+ if print_list is True:
for mck in mck_ids:
print (mck)
return mck_ids
@@ -820,7 +819,7 @@ class OracleInterface:
for smck in results:
smck_ids.append(smck[0])
smck_ids.sort()
- if print_list==True:
+ if print_list is True:
for smck in smck_ids:
print (smck)
return smck_ids
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/ToolInterrogator.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/ToolInterrogator.py
index a0a18d8dd092b1052f11acbbc087a750d2fd1f43..1ffd103d46efceb04aae0bfd7c4c078f8aff66a2 100644
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/ToolInterrogator.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/ToolInterrogator.py
@@ -3,6 +3,8 @@
# Authors: Ben Smart (ben.smart@cern.ch), Xanthe Hoad (xanthe.hoad@cern.ch)
# See https://twiki.cern.ch/twiki/bin/view/Atlas/MaDQM for more information
+# flake8: noqa (obsolete code)
+
from __future__ import print_function
import sys
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigMETMonitoring/CMakeLists.txt
index 772b26e8c399f5cc890f88951d139d7232b96bf3..af0f56e7b41bac9823b04b2da2aa4ab74997b76e 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/CMakeLists.txt
@@ -1,45 +1,19 @@
-################################################################################
-# Package: TrigMETMonitoring
-################################################################################
+#Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMETMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTrigMissingET
- Event/xAOD/xAODTrigger
- Reconstruction/MissingETEvent
- Trigger/TrigEvent/TrigMissingEtEvent
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigMonitoring/TrigHLTMonitoring
- PRIVATE
- Control/AthenaMonitoring
- Control/StoreGate
- GaudiKernel
- Trigger/TrigConfiguration/TrigConfL1Data )
-
# External dependencies:
find_package( CLHEP )
-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_component( TrigMETMonitoring
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel
- AthenaMonitoringLib
- TrigConfL1Data
- xAODEgamma xAODMissingET xAODMuon xAODTrigMissingET xAODTrigger
- MissingETEvent
- TrigMissingEtEvent TrigSteeringEvent TrigHLTMonitoringLib
- StoreGateLib SGtests )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthenaMonitoringKernelLib AthenaMonitoringLib GaudiKernel MissingETEvent StoreGateLib TrigConfL1Data TrigDecisionInterface TrigHLTMonitoringLib TrigMissingEtEvent xAODEgamma xAODEventInfo xAODMissingET xAODMuon xAODTrigMissingET xAODTrigger )
# Install files from the package:
-atlas_install_headers( TrigMETMonitoring )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitoringConfig.py b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitoringConfig.py
index 40a14336a8df34191bdd61257fbf7ff5928d0f42..139649dee102eb783effb3f1a8a4f5d9fc78d74e 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitoringConfig.py
@@ -77,28 +77,27 @@ met_alt_algorithms_expert = [
def HLTMETMonitoringTool():
- from TrigMETMonitoring.TrigMETMonitoringConf import HLTMETMonTool
- from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # access to central tool
- print ("shifter list " )
- print (hltmonList.monitoring_met_shifter)
- HLTMETMon = HLTMETMonTool(name = 'HLTMETMon',
+ from TrigMETMonitoring.TrigMETMonitoringConf import HLTMETMonTool
+ from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # access to central tool
+ print ("shifter list " )
+ print (hltmonList.monitoring_met_shifter)
+ HLTMETMon = HLTMETMonTool(name = 'HLTMETMon',
histoPathBase = "/Trigger/HLT",
MonPathBase = "/HLT/METMon",
comp_names = compNames_all,
bit_names = bitNames_allHLT,
- monitoring_met_shifter = hltmonList.monitoring_met_shifter,
- monitoring_met_expert = hltmonList.monitoring_met_expert,
+ monitoring_met_shifter = hltmonList.monitoring_met_shifter,
+ monitoring_met_expert = hltmonList.monitoring_met_expert,
monitoring_alg = met_alt_algorithms_shifter,
monitoring_alg_shifter = met_alt_algorithms_shifter,
monitoring_alg_expert = met_alt_algorithms_expert,
- muon_base = "HLT_mu26",
+ muon_base = "HLT_mu26",
muon_pt_thresh = 18,
electron_pt_thresh = 20,
primary_met = ["pufit"],
prescaled_met = [],
electron_run3_key = "HLT_xAOD__ElectronContainer_egamma_Electrons",
- );
- from AthenaCommon.AppMgr import ToolSvc
- #ToolSvc += HLTMETMon;
- list = [ HLTMETMon ];
- return list
+ )
+
+ list = [ HLTMETMon ]
+ return list
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/CMakeLists.txt b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/CMakeLists.txt
index 5b1a30c24a325228b608c9946021780648bfa1b8..e3fd3a4fa661064e0a98ccec3281d00a754a071e 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/CMakeLists.txt
@@ -1,28 +1,10 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
atlas_subdir( TrigMuonMonitoringMT )
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- GaudiKernel
- Trigger/TrigAnalysis/TrigDecisionTool
- PRIVATE
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTrigMuon
- Event/FourMomUtils
- Trigger/TrigSteer/DecisionHandling
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkEvent/TrkParameter
- Tracking/TrkVertexFitter/TrkVKalVrtFitter
- )
-
-
atlas_add_component( TrigMuonMonitoringMT
- src/*.cxx
- src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaBaseComps AthenaMonitoringLib GaudiKernel xAODMuon xAODTrigMuon TrigDecisionToolLib FourMomUtils DecisionHandlingLib TrkParameters TrkVKalVrtFitterLib
- )
-
+ src/*.cxx
+ src/components/*.cxx
+ LINK_LIBRARIES AthenaBaseComps AthenaMonitoringLib FourMomUtils GaudiKernel StoreGateLib TrigDecisionToolLib TrkExInterfaces TrkParameters xAODMuon xAODTracking xAODTrigMuon xAODTrigger )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
index 8471246d71280964288357de4aecb259278be4fd..b945a9573b4ee949fa69b1ff598e695b775acaae 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
@@ -15,7 +15,6 @@
#include "TrkExInterfaces/IExtrapolator.h"
#include "FourMomUtils/xAODP4Helpers.h"
#include "GaudiKernel/SystemOfUnits.h"
-#include "TRandom1.h"
#include <string>
#include <memory>
#include <tuple>
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigTauMonitoring/CMakeLists.txt
index 997373bd5756f091a8b9537f6d452570d1f98f0e..e8dde62a88233024127d1c5075e8a9a378ec3a8d 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/CMakeLists.txt
@@ -1,53 +1,17 @@
-################################################################################
-# Package: TrigTauMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigTauMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigParticle
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- LumiBlock/LumiBlockComps
- Control/AthenaKernel
- Control/AthenaMonitoring
- Control/StoreGate
- Event/EventInfo
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODJet
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTau
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigger
- Event/xAOD/xAODTruth
- GaudiKernel
- PhysicsAnalysis/AnalysisCommon/AnalysisUtils
- Reconstruction/tauEvent
- Tracking/TrkEvent/VxVertex
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation
- # Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigConfiguration/TrigConfL1Data
- Trigger/TrigEvent/TrigDecisionInterface
- Trigger/TrigMonitoring/TrigHLTMonitoring
- Trigger/TrigSteer/DecisionHandling )
-
# 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_component( TrigTauMonitoring
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigCaloEvent TrigInDetEvent TrigParticle TrigSteeringEvent AthenaMonitoringLib StoreGateLib SGtests EventInfo xAODEgamma xAODEventInfo xAODJet xAODMissingET xAODMuon xAODTau xAODTracking xAODTrigger xAODTruth GaudiKernel AnalysisUtilsLib tauEvent VxVertex TrigDecisionToolLib TrigConfL1Data TrigHLTMonitoringLib DecisionHandlingLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AnalysisUtilsLib AthenaKernel AthenaMonitoringLib EventInfo GaudiKernel LumiBlockCompsLib LumiBlockData StoreGateLib TrigConfL1Data TrigDecisionInterface TrigDecisionToolLib TrigHLTMonitoringLib TrigSteeringEvent TrigTauEmulationLib VxVertex tauEvent xAODEgamma xAODEventInfo xAODJet xAODMissingET xAODMuon xAODTau xAODTracking xAODTrigger xAODTruth )
# 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/TrigTauMonitoring/python/TrigTauMonitCategory.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
index 02efb6ed1c1fcd441874bf7792efb96b376872c1..22f240f03dc21aab1b97fb726031e832e56fee41 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
@@ -1,6 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from TriggerJobOpts.TriggerFlags import TriggerFlags
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
monitoring_tau_FTK = [
'tau12_idperf_FTK',
@@ -22,7 +20,7 @@ monitoring_singleTau = [
]
monitoring_tau = [
- 'tau0_perf_ptonly_L1TAU12',
+ 'tau0_perf_ptonly_L1TAU12',
'tau0_perf_ptonly_L1TAU60',
'tau25_idperf_track',
'tau25_idperf_tracktwo',
@@ -30,34 +28,34 @@ monitoring_tau = [
'tau25_medium1_tracktwo',
'tau35_perf_tracktwo_tau25_perf_tracktwo',
'tau35_medium1_tracktwo_tau25_medium1_tracktwo',
- 'tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM',
+ 'tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM',
'mu14_iloose_tau25_perf_tracktwo',
'tau160_idperf_track',
'tau160_idperf_tracktwo',
'tau160_perf_tracktwo',
- 'tau160_medium1_tracktwo',
- 'tau1_cosmic_track_L1MU4_EMPTY',
- 'tau1_cosmic_ptonly_L1MU4_EMPTY',
- 'tau8_cosmic_ptonly',
- 'tau8_cosmic_track'
+ 'tau160_medium1_tracktwo',
+ 'tau1_cosmic_track_L1MU4_EMPTY',
+ 'tau1_cosmic_ptonly_L1MU4_EMPTY',
+ 'tau8_cosmic_ptonly',
+ 'tau8_cosmic_track'
]
monitoring_tau_pp = [
- 'tau0_perf_ptonly_L1TAU12',
- 'tau0_perf_ptonly_L1TAU60',
- 'tau25_idperf_track',
- 'tau25_idperf_tracktwo',
- 'tau25_perf_tracktwo',
- 'tau25_medium1_tracktwo',
- 'tau25_medium1_tracktwoEF',
- 'tau25_mediumRNN_tracktwoMVA',
- 'tau35_mediumRNN_tracktwoMVA_L1TAU12IM',
- 'tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM', #keep this as reference for the L1Topo plots
- 'mu14_iloose_tau25_perf_tracktwo', # need to move to the ivarloose chain
- 'tau160_idperf_track',
- 'tau160_idperf_tracktwo',
- 'tau160_perf_tracktwo',
- 'tau160_medium1_tracktwo',
+ 'tau0_perf_ptonly_L1TAU12',
+ 'tau0_perf_ptonly_L1TAU60',
+ 'tau25_idperf_track',
+ 'tau25_idperf_tracktwo',
+ 'tau25_perf_tracktwo',
+ 'tau25_medium1_tracktwo',
+ 'tau25_medium1_tracktwoEF',
+ 'tau25_mediumRNN_tracktwoMVA',
+ 'tau35_mediumRNN_tracktwoMVA_L1TAU12IM',
+ 'tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM', #keep this as reference for the L1Topo plots
+ 'mu14_iloose_tau25_perf_tracktwo', # need to move to the ivarloose chain
+ 'tau160_idperf_track',
+ 'tau160_idperf_tracktwo',
+ 'tau160_perf_tracktwo',
+ 'tau160_medium1_tracktwo',
'tau25_idperf_track_L1TAU12IM',
'tau25_idperf_tracktwo_L1TAU12IM',
'tau25_perf_tracktwo_L1TAU12IM',
@@ -84,46 +82,46 @@ monitoring_tau_pp = [
]
monitoring_tau_validation = [
- 'tau0_perf_ptonly_L1TAU12',
- 'tau0_perf_ptonly_L1TAU60',
- 'tau25_idperf_track',
- 'tau25_idperf_tracktwo',
- 'tau25_perf_ptonly',
- 'tau25_perf_tracktwo',
- 'tau25_medium1_tracktwo',
- 'tau25_loose1_tracktwo',
- 'tau25_tight1_tracktwo',
- 'tau25_medium1_tracktwo_L1TAU12',
- 'tau25_medium1_tracktwo_L1TAU12IL',
- 'tau25_medium1_tracktwo_L1TAU12IT',
- 'tau25_loose1_ptonly',
- 'tau25_medium1_ptonly',
- 'tau25_tight1_ptonly',
- 'mu14_iloose_tau25_perf_tracktwo',
- 'tau35_perf_tracktwo',
- 'tau35_perf_ptonly',
- 'tau50_medium1_tracktwo_L1TAU12',
- 'tau80_medium1_tracktwo',
- 'tau80_medium1_tracktwo_L1TAU60',
- 'tau125_medium1_tracktwo',
- 'tau125_perf_tracktwo',
- 'tau125_perf_ptonly',
- 'tau160_idperf_track',
- 'tau160_idperf_tracktwo',
- 'tau160_perf_tracktwo',
- 'tau160_medium1_tracktwo',
- 'tau160_medium1HighptL_tracktwo',
- 'tau160_medium1HighptM_tracktwo',
- 'tau160_medium1HighptH_tracktwo',
- 'tau12_idperf_FTK',
- 'tau12_perf_FTK',
- 'tau12_perf0_FTK',
- 'tau12_perf_FTKNoPrec',
+ 'tau0_perf_ptonly_L1TAU12',
+ 'tau0_perf_ptonly_L1TAU60',
+ 'tau25_idperf_track',
+ 'tau25_idperf_tracktwo',
+ 'tau25_perf_ptonly',
+ 'tau25_perf_tracktwo',
+ 'tau25_medium1_tracktwo',
+ 'tau25_loose1_tracktwo',
+ 'tau25_tight1_tracktwo',
+ 'tau25_medium1_tracktwo_L1TAU12',
+ 'tau25_medium1_tracktwo_L1TAU12IL',
+ 'tau25_medium1_tracktwo_L1TAU12IT',
+ 'tau25_loose1_ptonly',
+ 'tau25_medium1_ptonly',
+ 'tau25_tight1_ptonly',
+ 'mu14_iloose_tau25_perf_tracktwo',
+ 'tau35_perf_tracktwo',
+ 'tau35_perf_ptonly',
+ 'tau50_medium1_tracktwo_L1TAU12',
+ 'tau80_medium1_tracktwo',
+ 'tau80_medium1_tracktwo_L1TAU60',
+ 'tau125_medium1_tracktwo',
+ 'tau125_perf_tracktwo',
+ 'tau125_perf_ptonly',
+ 'tau160_idperf_track',
+ 'tau160_idperf_tracktwo',
+ 'tau160_perf_tracktwo',
+ 'tau160_medium1_tracktwo',
+ 'tau160_medium1HighptL_tracktwo',
+ 'tau160_medium1HighptM_tracktwo',
+ 'tau160_medium1HighptH_tracktwo',
+ 'tau12_idperf_FTK',
+ 'tau12_perf_FTK',
+ 'tau12_perf0_FTK',
+ 'tau12_perf_FTKNoPrec',
'tau12_perf0_FTKNoPrec',
'tau12_medium0_FTK',
'tau12_medium1_FTK',
'tau12_medium0_FTKNoPrec',
- 'tau12_medium1_FTKNoPrec',
+ 'tau12_medium1_FTKNoPrec',
'tau25_idperf_tracktwo_L1TAU12IM_FTK',
'tau25_perf_tracktwo_L1TAU12IM_FTK',
'tau25_medium1_tracktwo_L1TAU12IM_FTK'
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
index ac57143711f8b7d8e625ff7bd812c8dc7df34b22..41b89565859bac661f109e4a6b37213c5de7e445 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
@@ -118,7 +118,6 @@ def TrigTauMonitoringTool():
from AthenaCommon.AppMgr import ToolSvc
ToolSvc += Level1Emulator
- from AthenaCommon.Constants import VERBOSE, DEBUG, INFO, ERROR
from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgOnlineDefault
LuminosityCondAlgOnlineDefault (suffix = 'Online')
@@ -181,10 +180,8 @@ def TrigTauMonitoringTool():
AbsPhiMax = -1.,
AbsPhiMin = -1.,
BDTMedium = True,
- isData = (globalflags.DataSource == 'data'));
- #from AthenaCommon.AppMgr import ToolSvc
- #ToolSvc += HLTTauMon;
+ isData = (globalflags.DataSource == 'data'))
+
print (ToolSvc)
- list = [ HLTTauMon ];
+ list = [ HLTTauMon ]
return list
-from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/share/Makefile b/Trigger/TrigMonitoring/TrigTauMonitoring/share/Makefile
deleted file mode 100644
index a038b40c74b56b5839d678491d0939a234ae1f02..0000000000000000000000000000000000000000
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/share/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-#export TEXINPUTS=.//:/usr/share/texmf/tex/latex//:../../../external//:
-
-#-------------------------------------------------------------------------------
-# user variables
-#-------------------------------------------------------------------------------
-doc = plotbook
-latex = latex # latex or pdflatex
-gv_scale = 1
-
-#-------------------------------------------------------------------------------
-
-deps := $(wildcard *.tex figs/*.pdf figs/*.eps)
-alltexs := $(wildcard *.tex)
-texs = $(filter-out $(doc).tex,$(alltexs))
-
-#-------------------------------------------------------------------------------
-# targets
-#-------------------------------------------------------------------------------
-#default: $(doc).pdf show
-default: $(doc).pdf
- @echo "--------------------------------------------------------------------------------"
- @echo "make $@"
- @echo "--------------------------------------------------------------------------------"
- @echo "Your dependencies are: $(deps)"
-
-$(doc).pdf: $(deps)
- @echo "--------------------------------------------------------------------------------"
- @echo "make $@"
- @echo "--------------------------------------------------------------------------------"
- @make $(latex)
-
-.PHONY: pdflatex
-pdflatex:
- @echo "--------------------------------------------------------------------------------"
- @echo "make $@"
- @echo "--------------------------------------------------------------------------------"
- pdflatex $(doc).tex
- pdflatex $(doc).tex
-
-.PHONY: latex
-latex: $(doc).ps
- @echo "--------------------------------------------------------------------------------"
- @echo "make $@"
- @echo "--------------------------------------------------------------------------------"
- ps2pdf -sPAPERSIZE=a4 -dAutoRotatePages#/PageByPage $(doc).ps $(doc).pdf
-
-$(doc).ps: $(doc).dvi
- @echo "--------------------------------------------------------------------------------"
- @echo "make $@"
- @echo "--------------------------------------------------------------------------------"
- dvips -o $(doc).ps $(doc).dvi
-
-$(doc).dvi: $(doc).tex
- @echo "--------------------------------------------------------------------------------"
- @echo "make $@"
- @echo "--------------------------------------------------------------------------------"
- latex $(doc).tex
- latex $(doc).tex
-
-.PHONY: over
-over: realclean default
- @echo "--------------------------------------------------------------------------------"
- @echo "make $@"
- @echo "--------------------------------------------------------------------------------"
-
-.PHONY: clean
-clean:
- @echo "--------------------------------------------------------------------------------"
- @echo "make $@"
- @echo "--------------------------------------------------------------------------------"
- rm -f *.aux $(doc).bbl $(doc).blg $(doc).dvi $(doc).log $(doc).nav $(doc).out $(doc).ps $(doc).snm $(doc).toc
-
-.PHONY: realclean
-realclean: clean
- @echo "--------------------------------------------------------------------------------"
- @echo "make $@"
- @echo "--------------------------------------------------------------------------------"
- rm -f $(doc).pdf
-
-.PHONY: show
-show:
- @echo "--------------------------------------------------------------------------------"
- @echo "make $@"
- @echo "--------------------------------------------------------------------------------"
- @if [ `ps ax | grep -v grep | grep gv | grep -c $(doc).pdf` -eq 0 ]; then\
- echo "Opening document with ghostview...";\
- sleep 2;\
- gv -antialias -watch -scale=$(gv_scale) -resize $(doc).pdf & \
- else \
- echo "Document is already open with ghostview.";\
- fi
-