Digi download changes + evt_size = 400 kB for hlt1

python/MooreTests/run_bandwidth_test_jobs.py

@@ -142,6 +142,11 @@ if __name__ == '__main__':
         help='Comma separated paths to directories, one per job, where the '
         'input files will be cached (default is hostname dependent or '
         '$XDG_RUNTIME_DIR).')
+    parser.add_argument(
+        '--digi',
+        default=False,
+        action='store_true',
+        help='Flag to download digi files as opposed to the default mdf files')
     args = parser.parse_args()
 
     logging.basicConfig(
@@ -194,14 +199,15 @@ if __name__ == '__main__':
                 f'Downloading input files {inputs[:MAX_NFILES_TO_PRINT_TO_LOG]}'
             )
             if all(is_remote(url) for url in inputs):
-                from Moore.qmtest.context import download_mdf_inputs_locally
-                # download_mdf_inputs_locally only downloads if files
+                from Moore.qmtest.context import download_mdf_inputs_locally, download_digi_inputs_locally
+                # download_inputs_locally only downloads if files
                 # are not already available locally on the machine
                 logging.info(
                     'Downloading inputs for bandwidth job to {}'.format(
                         args.cache_dirs[i]))
                 kB_to_GB = 1e3
-                job_inputs[i] = download_mdf_inputs_locally(
+                download_inputs_locally = download_digi_inputs_locally if args.digi else download_mdf_inputs_locally
+                job_inputs[i] = download_inputs_locally(
                     inputs,
                     args.cache_dirs[i],
                     max_size=args.avg_evt_size * kB_to_GB * args.events)

scripts/benchmark-scripts/Moore_bandwidth_test.sh

@@ -103,13 +103,13 @@ case $PROCESS in
     hlt1)
     MOORE_THREADS=1
     TEST_PATH_PREFIX='$HLT1CONFROOT/tests/options/bandwidth/'
-    EVENT_SIZE_UPPER_LIMIT=200
+    EVENT_SIZE_UPPER_LIMIT=400
     GAUDIRUN_INPUT_PROCESS="Hlt1"
     STREAM_CONFIGS=( "streamless" )
     case $INPUTDATA in
         nominal)
         CONFIG_FILE="${TEST_PATH_PREFIX}hlt1_bandwidth_input.yaml"
-        EXTRA_OPTS="-e 1 $MOOREROOT/options/muon_geometry_v2.py" #Requires #EvtSlots==1 due to singlethreading on DIGIs.
+        EXTRA_OPTS="-e 1 --digi $MOOREROOT/options/muon_geometry_v2.py" #Requires #EvtSlots==1 due to singlethreading on DIGIs.
         ;;
         *)
         echo "ERROR: --input-data must be \"nominal\" for process \"$PROCESS\""