Merge branch 'main' into 'debug-timings-all-return-true'

# Conflicts:
#   .gitlab-ci.yml

.gitlab-ci.yml

 image: eicweb.phy.anl.gov:4567/containers/eic_container/jug_xl:nightly
 
 variables:
-  JOBS: 1
+  JOBS: 8
 
 default:
   timeout: 3 hours
@@ -56,7 +56,7 @@ stages:
     - mkdir -p $(dirname results/datasets/timings/$DATA)
     - echo $DATA
     - cat results/datasets/nevents/$DATA | grep -v "^\#"
-    - cat results/datasets/nevents/$DATA | grep -v "^\#" | parallel -j 16 --colsep "," scripts/determine_timing.sh {1} {2} {3} | tee results/datasets/timings/$DATA || true
+    - cat results/datasets/nevents/$DATA | grep -v "^\#" | parallel -j $JOBS --colsep "," scripts/determine_timing.sh {1} {2} {3} | sort | tee results/datasets/timings/$DATA || true
 
 .collect:
   stage: collect