From 54fb11d9ca66d0269b37c3a0d5ca3211a8bff508 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Thu, 10 Dec 2020 17:06:52 +0100
Subject: [PATCH] InDetGlobalMonitoringRun3Test: cmake fixes, enable flake8
Update link dependencies and enable flake8.
---
.../CMakeLists.txt | 18 +++---------------
.../InDetGlobalPrimaryVertexMonAlgCfg.py | 2 --
.../python/InDetGlobalTrackMonAlgCfg.py | 6 +-----
3 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/CMakeLists.txt b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/CMakeLists.txt
index d78d12aa18d..c43ba0839d3 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/CMakeLists.txt
@@ -1,23 +1,11 @@
-################################################################################
-# Package: InDetGlobalMonitoringRun3Test
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetGlobalMonitoringRun3Test )
-# External dependencies:
-find_package( ROOT COMPONENTS Core MathCore Hist )
-
# Component(s) in the package:
atlas_add_component( InDetGlobalMonitoringRun3Test
InDetGlobalMonitoringRun3Test/*.h src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- PRIVATE_LINK_LIBRARIES InDetConditionsSummaryService
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib AtlasDetDescr
- GaudiKernel InDetRawData InDetPrepRawData TrkTrack InDetByteStreamErrors
- AthenaPoolUtilities GeoPrimitives xAODEventInfo EventPrimitives InDetIdentifier
- InDetReadoutGeometry InDetRIO_OnTrack LWHists TrkParameters TrkSpacePoint VxVertex TrkVertexFitterInterfaces xAODTracking
- TrkTrackSummary TrkToolInterfaces PixelCablingLib PixelGeoModelLib PathResolver BeamSpotConditionsData
- InDetTrackSelectionToolLib )
+ LINK_LIBRARIES AthenaMonitoringKernelLib AthenaMonitoringLib AtlasDetDescr BeamSpotConditionsData EventPrimitives GaudiKernel InDetConditionsSummaryService InDetIdentifier InDetPrepRawData InDetTrackSelectionToolLib PixelGeoModelLib StoreGateLib TrkEventPrimitives TrkToolInterfaces TrkTrack TrkTrackSummary xAODTracking )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalPrimaryVertexMonAlgCfg.py b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalPrimaryVertexMonAlgCfg.py
index c14bda11492..7116ea2c2f8 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalPrimaryVertexMonAlgCfg.py
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalPrimaryVertexMonAlgCfg.py
@@ -9,8 +9,6 @@
@brief Configuration for Run 3 based on InDetGlobalPrimaryVertexMonTool.cxx
"""
-from math import pi as M_PI
-
def InDetGlobalPrimaryVertexMonAlgCfg(helper, alg, **kwargs):
# this creates a "pvGroup" called "alg" which will put its histograms into the subdirectory "PrimaryVertex"
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalTrackMonAlgCfg.py b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalTrackMonAlgCfg.py
index 6e77516ec5c..66e13dbd41f 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalTrackMonAlgCfg.py
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalTrackMonAlgCfg.py
@@ -13,18 +13,14 @@ from math import pi as M_PI
def InDetGlobalTrackMonAlgCfg(helper, alg, **kwargs):
- # values
- m_doIBL = True
+ # values
m_nBinsEta = 50
m_nBinsPhi = 50
m_trackBin = 75
m_c_etaRange = 2.5
- m_c_etaTrackletsMin = 2.4
- m_c_etaTrackletsMax = 2.7
m_c_etaRangeTRT = 2.0
m_c_range_LB = 3000
m_trackMax = 75
- #M_PI = math.pi
# this creates a "trackGroup" called "alg" which will put its histograms into the subdirectory "Track"
trackGroup = helper.addGroup(alg, 'Track')
--
GitLab