Scripts changed to pick up analysis scripts from Moore

scripts/benchmark-scripts/Moore_data_max_candidates_test.sh

@@ -17,6 +17,6 @@ else
     EVTMAX=${OVERRIDE_EVTMAX}
 fi
 
-time python $HLT2CONFROOT/python/Hlt2Conf/tests/run_max_candidates_job -n $EVTMAX --test-file-db-key=2024_hlt1_mdf_dumps_ReverseGEC12K '$HLT2CONFROOT/tests/options/hlt2_max_candidates_pp_2024.py'
+time python $HLT2CONFROOT/python/Hlt2Conf/tests/run_max_candidates_job.py -n $EVTMAX --test-file-db-key=2024_hlt1_mdf_dumps_ReverseGEC12K '$HLT2CONFROOT/tests/options/hlt2_max_candidates_pp_2024.py'
 
-time python $HLT2CONFROOT/python/Hlt2Conf/tests/analyze_max_candidates
+time python $HLT2CONFROOT/python/Hlt2Conf/tests/analyze_max_candidates.py

scripts/benchmark-scripts/Moore_max_candidates_test.sh

+
 #!/bin/bash
 ###############################################################################
 # (c) Copyright 2024 CERN for the benefit of the LHCb Collaboration           #
@@ -10,8 +11,12 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 echo "Running Moore For Max Candidates test"
-N=100000
+if [ -z "${OVERRIDE_EVTMAX}" ]; then
+    EVTMAX=1e5
+else
+    EVTMAX=${OVERRIDE_EVTMAX}
+fi
 
-time python $HLT2CONFROOT/python/Hlt2Conf/tests/run_max_candidates_job.py -n $N --test-file-db-key=expected_2024_min_bias_hlt1_filtered_v2 '$HLT2CONFROOT/tests/options/hlt2_max_candidates_pp_2024.py'
+time python -m MooreTests.run_max_candidates_job -n $EVTMAX --test-file-db-key=expected_2024_min_bias_hlt1_filtered_v2 '$HLT2CONFROOT/tests/options/hlt2_max_candidates_pp_2024.py'
 
-time python $HLT2CONFROOT/python/Hlt2Conf/tests/analyze_max_candidates.py
+time python -m MooreTests.analyze_max_candidates