diff --git a/python/MooreTests/combine-spruce-rate-output.py b/python/MooreTests/combine-spruce-rate-output.py index acdb0a977b4f445aa161947fb3b0d9860dcf451a..003a1852bfc314a4666cfdbbb3066fffd050639e 100644 --- a/python/MooreTests/combine-spruce-rate-output.py +++ b/python/MooreTests/combine-spruce-rate-output.py @@ -20,7 +20,7 @@ def rates_all_lines(): streams = [ 'b_to_open_charm', 'rd', 'bandq', 'qee', 'charm', 'b_to_charmonia', - 'slepton', 'c_to_dimuon', 'bnoc', 'dimuon' + 'slepton', 'c_to_dimuon', 'bnoc' ] frames = [] @@ -74,7 +74,7 @@ def rates_wg_streams(): streams = [ 'b_to_open_charm', 'rd', 'bandq', 'qee', 'charm', 'b_to_charmonia', - 'slepton', 'c_to_dimuon', 'bnoc', 'dimuon' + 'slepton', 'c_to_dimuon', 'bnoc' ] frames = [] diff --git a/python/MooreTests/hlt2-stream-configs.py b/python/MooreTests/hlt2-stream-configs.py index acaca9493e97bd99ddb5e5ee50a438b874b6cc2c..b191ce5df641692cd60397825bac3d038f5a25a1 100644 --- a/python/MooreTests/hlt2-stream-configs.py +++ b/python/MooreTests/hlt2-stream-configs.py @@ -24,7 +24,6 @@ from Hlt2Conf.lines import ( monitoring, charmonium_to_dimuon, bnoc, - DiMuonNoIP, trackeff, ift, ) @@ -52,7 +51,7 @@ def fiveConfig(): 'turbo': module_names([ b_to_open_charm, rd, bandq, charm, b_to_charmonia, semileptonic, - bnoc, charmonium_to_dimuon, DiMuonNoIP, qee + bnoc, charmonium_to_dimuon, qee ]), 'full': module_names([topological_b, inclusive_detached_dilepton]), @@ -74,14 +73,14 @@ def sixteenConfig(): names = [ 'b_to_open_charm', 'rd', 'bandq', 'charm', 'b_to_charmonia', 'slepton', - 'bnoc', 'c_to_dimuon', 'dimuon', 'qee', 'pid', 'trackeff', - 'monitoring', 'topo_b', 'dilepton', 'ift' + 'bnoc', 'c_to_dimuon', 'qee', 'pid', 'trackeff', 'monitoring', + 'topo_b', 'dilepton', 'ift' ] mods = [ b_to_open_charm, rd, bandq, charm, b_to_charmonia, semileptonic, bnoc, - charmonium_to_dimuon, DiMuonNoIP, qee, pid, trackeff, monitoring, - topological_b, inclusive_detached_dilepton, ift + charmonium_to_dimuon, qee, pid, trackeff, monitoring, topological_b, + inclusive_detached_dilepton, ift ] config = {} diff --git a/python/MooreTests/spruce-stream-configs.py b/python/MooreTests/spruce-stream-configs.py index 3ff71d20944b9937121cd11caaf88b60a04d7a26..717039e4408a44d1b71a88ec71f94c7542d7882c 100644 --- a/python/MooreTests/spruce-stream-configs.py +++ b/python/MooreTests/spruce-stream-configs.py @@ -20,7 +20,6 @@ from Hlt2Conf.lines import ( semileptonic, charmonium_to_dimuon, bnoc, - DiMuonNoIP, ) import logging log = logging.getLogger() @@ -46,12 +45,12 @@ def wgConfig(): names = [ 'b_to_open_charm', 'rd', 'bandq', 'qee', 'charm', 'b_to_charmonia', - 'slepton', 'c_to_dimuon', 'bnoc', 'dimuon' + 'slepton', 'c_to_dimuon', 'bnoc' ] mods = [ b_to_open_charm, rd, bandq, qee, charm, b_to_charmonia, semileptonic, - charmonium_to_dimuon, bnoc, DiMuonNoIP + charmonium_to_dimuon, bnoc ] config = {} diff --git a/scripts/benchmark-scripts/Moore_hlt2_bandwidth.sh b/scripts/benchmark-scripts/Moore_hlt2_bandwidth.sh index be60082b8b6c1109f4165131a813f40cbe104892..dca2aacdd60daac3307c14656a171b5ac53e61cb 100755 --- a/scripts/benchmark-scripts/Moore_hlt2_bandwidth.sh +++ b/scripts/benchmark-scripts/Moore_hlt2_bandwidth.sh @@ -52,7 +52,7 @@ done # 7. Computing rates per WG as well as per line (tables split by WG) echo 'Obtaining rates and bandwidth for WG-stream configuration' -for module in b_to_open_charm b_to_charmonia bandq bnoc c_to_dimuon charm dilepton dimuon pid qee rd slepton topo_b trackeff monitoring ift; do +for module in b_to_open_charm b_to_charmonia bandq bnoc c_to_dimuon charm dilepton pid qee rd slepton topo_b trackeff monitoring ift; do echo "Stream name: ${module}" time python $PRCONFIGROOT/python/MooreTests/line-and-stream-rates.py -n $EVTS_STREAMLESS -p Hlt2 -i tmp/MDF/baseline-wg-"${module}".mdf -t tmp/MDF/baseline-wg-streams.tck.json -j tmp/Output/hlt2-wg-stream-config.json -c 'wg' done @@ -73,7 +73,7 @@ for strm in full turbo turcal; do done echo 'Computing filesizes for per-WG stream allocation' -for strm in b_to_open_charm b_to_charmonia bandq bnoc c_to_dimuon charm dilepton dimuon pid qee rd slepton topo_b trackeff monitoring ift; do +for strm in b_to_open_charm b_to_charmonia bandq bnoc c_to_dimuon charm dilepton pid qee rd slepton topo_b trackeff monitoring ift; do time python -m MooreTests.filesize -p Hlt2 -i tmp/MDF/baseline-wg-"${strm}".mdf -t tmp/MDF/baseline-wg-streams.tck.json -o tmp/Output/filesize.txt done diff --git a/scripts/benchmark-scripts/Moore_spruce_bandwidth.sh b/scripts/benchmark-scripts/Moore_spruce_bandwidth.sh index af9fc8ab23b15944dd8c5fb542abe01b8c27caf2..af97915f0c8d72076757e4d57ad2d69051a0d84b 100755 --- a/scripts/benchmark-scripts/Moore_spruce_bandwidth.sh +++ b/scripts/benchmark-scripts/Moore_spruce_bandwidth.sh @@ -40,7 +40,7 @@ echo 'Obtaining similarity matrix for wg-stream configuration' time python $PRCONFIGROOT/python/MooreTests/stream-overlap.py -p Spruce -i tmp/MDF/baseline-streamless-all.mdf -t tmp/MDF/baseline-streamless-all.tck.json -j tmp/Output/wg-stream-config.json -c wg echo 'Obtaining rates and bandwidth for wg-stream configuration' -for module in b_to_open_charm rd bandq charm qee charm b_to_charmonia slepton c_to_dimuon bnoc dimuon; do +for module in b_to_open_charm rd bandq charm qee charm b_to_charmonia slepton c_to_dimuon bnoc; do echo "Stream name: ${module}" time python $PRCONFIGROOT/python/MooreTests/line-and-stream-rates.py -n 1e5 -p Spruce -r 175 -i tmp/MDF/baseline-wg-"${module}".mdf -t tmp/MDF/baseline-wg-streams.tck.json -j tmp/Output/wg-stream-config.json -c wg done @@ -55,7 +55,7 @@ echo 'Computing size for baseline models' time python -m MooreTests.filesize -p Spruce -i tmp/MDF/baseline-streamless-all.mdf -t tmp/MDF/baseline-streamless-all.tck.json -o tmp/Output/filesize.txt echo 'Computing filesizes for per-WG stream allocation' -for strm in b_to_open_charm rd bandq charm qee charm b_to_charmonia slepton c_to_dimuon bnoc dimuon; do +for strm in b_to_open_charm rd bandq charm qee charm b_to_charmonia slepton c_to_dimuon bnoc; do time python -m MooreTests.filesize -p Spruce -i tmp/MDF/baseline-wg-"${strm}".mdf -t tmp/MDF/baseline-wg-streams.tck.json -o tmp/Output/filesize.txt done