diff --git a/scripts/benchmark-scripts/Moore_bandwidth_test.sh b/scripts/benchmark-scripts/Moore_bandwidth_test.sh index a9a65f083da4e93494819147a995552c3ece5057..905af7be82e319cea32f142444e0c0d6dd766cfc 100755 --- a/scripts/benchmark-scripts/Moore_bandwidth_test.sh +++ b/scripts/benchmark-scripts/Moore_bandwidth_test.sh @@ -323,12 +323,19 @@ if [ $PROCESS == "hlt2" ]; then done fi -# 9. Combine all output into tables +# 9. Extract monitoring histogram plots +if [[ $PROCESS != "spruce" || $STREAM_CONFIG == "full" ]]; then + echo 'Extracting monitoring histograms' + time python ${HLT2CONFROOT}/python/Hlt2Conf/tests/bandwidth/extract_monitoring_histos.py --process $PROCESS --stream-config $STREAM_CONFIG + STORE_ERR_CODE +fi + +# 10. Combine all output into tables echo 'Combining all rate and bandwidth tables' time python ${SCRIPTROOT}/combine_rate_output.py --process $PROCESS --stream-config $STREAM_CONFIG STORE_ERR_CODE -# 9. Required information for 'hlt2-output-locally' or 'hlt2-output-from-eos' sprucing jobs. +# 11. Required information for 'hlt2-output-locally' or 'hlt2-output-from-eos' sprucing jobs. if [ $PROCESS = "hlt2" ]; then echo 'Generating yaml spruce input config to potentially use in a sprucing ["hlt2-output-locally", "hlt2-output-from-eos"] test' for STREAM in "${STREAMS[@]}"; do @@ -346,7 +353,7 @@ if [ $PROCESS = "hlt2" ]; then done fi -# 11. Copy the stream config JSON from $BASEDIR/MDF -> $BASEDIR/Output so the handler can pick it up. Bit of a hack +# 12. Copy the stream config JSON from $BASEDIR/MDF -> $BASEDIR/Output so the handler can pick it up. Bit of a hack # Needed so it can be put in the html page cp $STREAM_CONFIG_JSON_PATH $BASEDIR/Output/ STORE_ERR_CODE