Skip to content
Snippets Groups Projects
Commit fe37a84e authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch 'lumiblock_cleanup' into 'master' 

LumiBlock: cmake cleanup, flake8, thread checker

See merge request !35078
parents d16e9c6b 74a8016a
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!35078LumiBlock: cmake cleanup, flake8, thread checker
Hide whitespace changes
Inline Side-by-side
Showing
with 38 additions and 102 deletions
LumiBlock/LumiBlockComps/CMakeLists.txt
+ 1
− 5
View file @ fe37a84e
# $Id: CMakeLists.txt 789876 2016-12-15 13:57:55Z krasznaa $
################################################################################
# Package: LumiBlockComps
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LumiBlockComps )
......@@ -79,7 +76,6 @@ atlas_add_test( LumiBlockMuWriterConfig_test
SCRIPT python -m LumiBlockComps.LumiBlockMuWriterConfig
LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
atlas_add_test( BunchCrossingCondAlg
SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/BunchCrossingCondAlgTest.py
POST_EXEC_SCRIPT " /usr/bin/diff BCData.txt ${CMAKE_CURRENT_SOURCE_DIR}/share/BCData.txt.ref > BC_diff.log " )
LumiBlock/LumiBlockData/CMakeLists.txt
+ 4
− 17
View file @ fe37a84e
################################################################################
# Package: LumiBlockData
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LumiBlockData )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
Control/AthContainers )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( LumiBlockData
src/*.cxx
PUBLIC_HEADERS LumiBlockData
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthenaKernel AthContainers
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
LINK_LIBRARIES AthenaKernel AthContainers )
atlas_add_dictionary( LumiBlockDataDict
LumiBlockData/LumiBlockDataDict.h
LumiBlockData/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel AthContainers LumiBlockData )
LINK_LIBRARIES LumiBlockData )
# Tests in the package:
atlas_add_test( LBDurationCondData_test
SOURCES test/LBDurationCondData_test.cxx
LINK_LIBRARIES LumiBlockData )
......@@ -38,4 +26,3 @@ atlas_add_test( LuminosityCondData_test
atlas_add_test( TrigLiveFractionCondData_test
SOURCES test/TrigLiveFractionCondData_test.cxx
LINK_LIBRARIES LumiBlockData )
LumiBlock/LumiBlockPers/LumiBlockAthenaPool/CMakeLists.txt
+ 2
− 13
View file @ fe37a84e
################################################################################
# Package: LumiBlockAthenaPool
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LumiBlockAthenaPool )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Database/AthenaPOOL/AthenaPoolUtilities
PRIVATE
Database/AthenaPOOL/AthenaPoolCnvSvc
LumiBlock/LumiBlockData
LumiBlock/LumiBlockPers/LumiBlockTPCnv )
# Component(s) in the package:
atlas_add_poolcnv_library( LumiBlockAthenaPoolPoolCnv
src/*.cxx
FILES LumiBlockData/LumiBlockCollection.h
LINK_LIBRARIES AthenaPoolUtilities AthenaPoolCnvSvcLib LumiBlockData LumiBlockTPCnv )
LINK_LIBRARIES AthenaPoolCnvSvcLib LumiBlockData LumiBlockTPCnv )
LumiBlock/LumiBlockPers/LumiBlockTPCnv/CMakeLists.txt
+ 7
− 24
View file @ fe37a84e
################################################################################
# Package: LumiBlockTPCnv
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LumiBlockTPCnv )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Database/AthenaPOOL/AthenaPoolCnvSvc
LumiBlock/LumiBlockData
PRIVATE
AtlasTest/TestTools
Control/AthenaKernel
GaudiKernel )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_tpcnv_library( LumiBlockTPCnv
src/*.cxx
PUBLIC_HEADERS LumiBlockTPCnv
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib LumiBlockData TestTools AthenaKernel GaudiKernel )
LINK_LIBRARIES AthenaPoolCnvSvcLib LumiBlockData
PRIVATE_LINK_LIBRARIES AthenaKernel )
atlas_add_dictionary( LumiBlockTPCnvDict
LumiBlockTPCnv/LumiBlockTPCnvDict.h
LumiBlockTPCnv/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib LumiBlockData TestTools AthenaKernel GaudiKernel LumiBlockTPCnv )
LINK_LIBRARIES LumiBlockTPCnv )
# Tests in the package:
atlas_add_test( LumiBlockRangeCnv_p1_test
SOURCES
test/LumiBlockRangeCnv_p1_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib LumiBlockData TestTools AthenaKernel GaudiKernel LumiBlockTPCnv )
LINK_LIBRARIES GaudiKernel TestTools LumiBlockTPCnv )
atlas_add_test( LumiBlockRangeCnv_p2_test
SOURCES
test/LumiBlockRangeCnv_p2_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib LumiBlockData TestTools AthenaKernel GaudiKernel LumiBlockTPCnv )
LINK_LIBRARIES GaudiKernel TestTools LumiBlockTPCnv )
LumiBlock/LumiBlockPers/LumiBlockTPCnv/LumiBlockTPCnv/ATLAS_CHECK_THREAD_SAFETY 0 → 100644
+ 1
− 0
View file @ fe37a84e
LumiBlock/LumiBlockPers/LumiBlockTPCnv
LumiBlock/LumiCalc/CMakeLists.txt
+ 4
− 23
View file @ fe37a84e
################################################################################
# Package: LumiCalc
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LumiCalc )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/CxxUtils
Control/AthenaKernel
DataQuality/GoodRunsLists
Event/xAOD/xAODLuminosity
LumiBlock/LumiBlockData
PRIVATE
Control/DataModelRoot
Database/APR/CollectionBase
Database/AthenaPOOL/DBDataModel
Database/CoolConvUtilities
Database/CoraCool )
# External dependencies:
find_package( COOL COMPONENTS CoolKernel )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
......@@ -33,8 +16,7 @@ atlas_add_library( LumiBlockCoolQuery
src/LumiBlockCollectionConverter.cxx
PUBLIC_HEADERS LumiCalc
INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel xAODLuminosity LumiBlockData GoodRunsListsLib
PRIVATE_LINK_LIBRARIES DataModelRoot CollectionBase DBDataModel )
LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel GoodRunsListsLib LumiBlockData xAODLuminosity )
atlas_add_executable( iLumiCalc
src/iLumiCalc.cxx
......@@ -43,10 +25,9 @@ atlas_add_executable( iLumiCalc
src/LumiBlockRangeContainerConverter.cxx
src/LumiCalculator.cxx
src/ReplicaSorter.cxx
INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel GoodRunsListsLib xAODLuminosity LumiBlockData DataModelRoot CollectionBase DBDataModel LumiBlockCoolQuery )
LINK_LIBRARIES LINK_LIBRARIES CollectionBase CxxUtils DBDataModel DataModelRoot LumiBlockCoolQuery )
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_scripts( share/*.py )
LumiBlock/LumiCalc/python/LumiCalcHtml.py
+ 18
− 18
View file @ fe37a84e
......@@ -151,7 +151,7 @@ class LumiCalc:
if self.fileitem.filename:
# strip any leading C: from windows
if self.fileitem.filename[0:2] is 'C:':
if self.fileitem.filename[0:2] == 'C:':
self.fileitem.filename = self.fileitem.filename[2:]
# strip leading path from file name to avoid directory traversal attacks
self.grlfn = os.path.basename(self.fileitem.filename)
......@@ -226,23 +226,23 @@ class LumiCalc:
#
def parseOutput(self):
matchrun = re.compile('Run ([0-9]+) LB \[([0-9]+)-([0-9]+)\]')
matchlumidel = re.compile(': IntL delivered \(ub\^-1\) : ([0-9\.e+]+)')
matchlumipre = re.compile(': IntL after livefraction \(ub\^-1\): ([0-9\.\e\+\-]+)')
matchlumilar = re.compile(': IntL after LAr fraction \(ub\^-1\): ([0-9\.\e\+\-]+)')
matchlumirec = re.compile(': IntL recorded after prescale \(ub\^-1\) : ([0-9\.\e\+\-]+)')
matchgoodlb = re.compile(': Good LBs : ([0-9]+)')
matchbadlb = re.compile(': Bad LBs : ([0-9]+)')
matchtotlumidel = re.compile(': Total IntL delivered \(ub\^-1\) : ([0-9\.\e\+\-]+)')
matchtotlumipre = re.compile(': Total IntL after livefraction \(ub\^-1\): ([0-9\.\e\+\-]+)')
matchtotlumilar = re.compile(': Total IntL after LAr fraction \(ub\^-1\): ([0-9\.\e\+\-]+)')
matchtotlumirec = re.compile(': Total IntL recorded \(ub\^-1\) : ([0-9\.\e\+\-]+)')
matchtotgoodlb = re.compile(': Total Good LBs : ([0-9]+)')
matchtotbadlb = re.compile(': Total Bad LBs : ([0-9]+)')
matchrealtime = re.compile(': Real time: ([0-9\.\e\+\-]+)')
matchcputime = re.compile(': CPU time: ([0-9\.\e\+\-]+)')
matchrun = re.compile(r'Run ([0-9]+) LB \[([0-9]+)-([0-9]+)\]')
matchlumidel = re.compile(r': IntL delivered \(ub\^-1\) : ([0-9\.e+]+)')
matchlumipre = re.compile(r': IntL after livefraction \(ub\^-1\): ([0-9\.\e\+\-]+)')
matchlumilar = re.compile(r': IntL after LAr fraction \(ub\^-1\): ([0-9\.\e\+\-]+)')
matchlumirec = re.compile(r': IntL recorded after prescale \(ub\^-1\) : ([0-9\.\e\+\-]+)')
matchgoodlb = re.compile(r': Good LBs : ([0-9]+)')
matchbadlb = re.compile(r': Bad LBs : ([0-9]+)')
matchtotlumidel = re.compile(r': Total IntL delivered \(ub\^-1\) : ([0-9\.\e\+\-]+)')
matchtotlumipre = re.compile(r': Total IntL after livefraction \(ub\^-1\): ([0-9\.\e\+\-]+)')
matchtotlumilar = re.compile(r': Total IntL after LAr fraction \(ub\^-1\): ([0-9\.\e\+\-]+)')
matchtotlumirec = re.compile(r': Total IntL recorded \(ub\^-1\) : ([0-9\.\e\+\-]+)')
matchtotgoodlb = re.compile(r': Total Good LBs : ([0-9]+)')
matchtotbadlb = re.compile(r': Total Bad LBs : ([0-9]+)')
matchrealtime = re.compile(r': Real time: ([0-9\.\e\+\-]+)')
matchcputime = re.compile(r': CPU time: ([0-9\.\e\+\-]+)')
self.runset = set()
self.lumidel = dict()
......
LumiBlock/LumiCalc/python/LumiCalcRecover.py
+ 1
− 1
View file @ fe37a84e
......@@ -20,7 +20,7 @@ lc.workdir = os.getcwd()
lc.subdir = os.path.basename(os.path.normpath(lc.workdir))
try:
lc.grlfn = os.path.basename(glob.glob(lc.workdir+'/*.xml')[0])
except:
except Exception:
lc.grlfn = ''
lc.f = open(lc.workdir+'/working.html', 'a')
......
LumiBlock/LumiCalc/python/LumiCalcWorking.py
+ 0
− 1
View file @ fe37a84e
......@@ -4,7 +4,6 @@
from __future__ import print_function
import cgi, os, sys
import glob
import cgitb
import subprocess
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment