slaclab · nstelter-slac · Jan 11, 2024 · Jan 18, 2024 · Jan 18, 2024 · Jan 18, 2024
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -21,7 +21,9 @@ jobs:
         pip install numpy
         pip install scipy
         pip install statsmodels
+        conda install -c conda-forge lcls-i::psana 
 
     - name: Run tests
       run: |
-        pytest testFitFunctions.py  # Replace with your actual test file name
+        pytest testFitFunctions.py
+        ./run_simple_test.sh
diff --git a/run_simple_test.sh b/run_simple_test.sh
@@ -0,0 +1,19 @@
+# results in ../scan will get overridden each run, so no need to delete inbetween
+# if ../scan_expected exists, create if doesn't
+if [ ! -d "../scan_expected" ]; then
+    mkdir ../scan_expected
+fi
+
+# copy scan_expected/ to ../scan_expected only if they diff
+if ! diff -r scan_expected/ ../scan_expected/ >/dev/null 2>&1; then
+    cp -r scan_expected/* ../scan_expected/
+fi
+
+python EventScanParallelSlice.py -r 349 > out.txt # output noisy so hide
+python EventScanParallelSlice.py -r 349 -f ../scan/EventScanParallel_c0_r349_n1.h5 >> out.txt
+
+if diff -r ../scan ../scan_expected/ >/dev/null 2>&1; then
+    echo "PASS"
+else
+    echo "FAIL"
+fi
diff --git a/scan_expected/EventScanParallel_c0_r349_n1.h5 b/scan_expected/EventScanParallel_c0_r349_n1.h5
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_All1.png b/scan_expected/EventScanParallel_r349_c0_timestamps_All1.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_ROI0.png b/scan_expected/EventScanParallel_r349_c0_timestamps_ROI0.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_ROI1.png b/scan_expected/EventScanParallel_r349_c0_timestamps_ROI1.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel0.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel0.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel0_hist.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel0_hist.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel1.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel1.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel1_hist.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel1_hist.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel2.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel2.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel2_hist.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel2_hist.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel3.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel3.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel3_hist.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel3_hist.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel4.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel4.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel4_hist.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel4_hist.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel5.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel5.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel5_hist.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel5_hist.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel6.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel6.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel6_hist.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel6_hist.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel7.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel7.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel7_hist.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel7_hist.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel8.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel8.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel8_hist.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel8_hist.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel9.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel9.png
diff --git a/scan_expected/EventScanParallel_r349_c0_timestamps_pixel9_hist.png b/scan_expected/EventScanParallel_r349_c0_timestamps_pixel9_hist.png
diff --git a/scan_expected/bitSlice_c0_r349_rixx1003721.npy b/scan_expected/bitSlice_c0_r349_rixx1003721.npy
diff --git a/scan_expected/eventNumbers_c0_r349_rixx1003721.npy b/scan_expected/eventNumbers_c0_r349_rixx1003721.npy
diff --git a/scan_expected/means_c0_r349_rixx1003721.npy b/scan_expected/means_c0_r349_rixx1003721.npy
diff --git a/scan_expected/pulseIds_c0_r349_rixx1003721.npy b/scan_expected/pulseIds_c0_r349_rixx1003721.npy