Merge pull request #69 from slaclab/beamtime_testing_script

TST: Add bash script to run beamtime scripts and remove un-used test files/data
slaclab · Apr 15, 2024 · 7842783 · 7842783
2 parents 3e6f935 + fe2e202
commit 7842783
Show file tree

Hide file tree

Showing 40 changed files with 26 additions and 92 deletions.
diff --git a/setup.sh b/setup.sh
@@ -1,18 +1,17 @@
 #!/bin/bash
 # Setup environment variables
 
-echo "executing the following commands..."
-
 # Get the current directory
 current_dir=$(pwd)
 # so scripts can find the calibrationSuite library code
 export PYTHONPATH="$PYTHONPATH:$current_dir"
-echo "export PYTHONPATH="\$PYTHONPATH:$current_dir""
 
 # so output folders are written in a shared location
+#export OUTPUT_ROOT="/sdf/data/lcls/ds/rix/rixx1003721/results/scripts/"
 export OUTPUT_ROOT="/sdf/data/lcls/ds/rix/rixx1005922/scratch/"
 echo "export OUTPUT_ROOT="\"$OUTPUT_ROOT\"
 
 # point to which config file to use
+#export SUITE_CONFIG="rixSuiteConfig.py"
 export SUITE_CONFIG="epixMSuiteConfig.py"
-echo "export SUITE_CONFIG="\"$SUITE_CONFIG\"
+echo "export SUITE_CONFIG="\"$SUITE_CONFIG\"
diff --git a/tests/disabled/OffXavierV4_2.npy b/tests/disabled/OffXavierV4_2.npy
diff --git a/tests/disabled/XavierV4_2.npy b/tests/disabled/XavierV4_2.npy
diff --git a/tests/disabled/disabled_test_AnalyzeH5.py b/tests/disabled/disabled_test_AnalyzeH5.py
diff --git a/tests/disabled/disabled_test_EventScanParallelSlice.py b/tests/disabled/disabled_test_EventScanParallelSlice.py
diff --git a/...ed/testData/expected/analyzeH5Expected/AnalyzeH5_r666_c0_r1_c14_testLabel_E.png b/...ed/testData/expected/analyzeH5Expected/AnalyzeH5_r666_c0_r1_c14_testLabel_E.png
diff --git a/...sabled/testData/expected/analyzeH5Expected/AnalyzeH5_r666_c0_r1_c14_testLabel_fitInfo.npy b/...sabled/testData/expected/analyzeH5Expected/AnalyzeH5_r666_c0_r1_c14_testLabel_fitInfo.npy
diff --git a/.../disabled/testData/expected/analyzeH5Expected/AnalyzeH5_r666_c0_testLabel_E.png b/.../disabled/testData/expected/analyzeH5Expected/AnalyzeH5_r666_c0_testLabel_E.png
diff --git a/...ata/expected/analyzeH5Expected/AnalyzeH5_r666_c0_testLabel_gainDistribution.png b/...ata/expected/analyzeH5Expected/AnalyzeH5_r666_c0_testLabel_gainDistribution.png
diff --git a/...disabled/testData/expected/eventScanParallelSliceExpected/EventScanParallel_c0_r349_n1.h5 b/...disabled/testData/expected/eventScanParallelSliceExpected/EventScanParallel_c0_r349_n1.h5
diff --git a/...ed/eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_All1.png b/...ed/eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_All1.png
diff --git a/...ed/eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_ROI0.png b/...ed/eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_ROI0.png
diff --git a/...ed/eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_ROI1.png b/...ed/eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_ROI1.png
diff --git a/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel0.png b/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel0.png
diff --git a/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel0_hist.png b/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel0_hist.png
diff --git a/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel1.png b/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel1.png
diff --git a/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel1_hist.png b/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel1_hist.png
diff --git a/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel2.png b/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel2.png
diff --git a/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel2_hist.png b/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel2_hist.png
diff --git a/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel3.png b/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel3.png
diff --git a/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel3_hist.png b/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel3_hist.png
diff --git a/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel4.png b/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel4.png
diff --git a/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel4_hist.png b/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel4_hist.png
diff --git a/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel5.png b/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel5.png
diff --git a/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel5_hist.png b/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel5_hist.png
diff --git a/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel6.png b/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel6.png
diff --git a/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel6_hist.png b/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel6_hist.png
diff --git a/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel7.png b/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel7.png
diff --git a/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel7_hist.png b/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel7_hist.png
diff --git a/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel8.png b/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel8.png
diff --git a/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel8_hist.png b/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel8_hist.png
diff --git a/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel9.png b/.../eventScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel9.png
diff --git a/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel9_hist.png b/...tScanParallelSliceExpected/EventScanParallel_r349_c0_timestamps_pixel9_hist.png
diff --git a/...isabled/testData/expected/eventScanParallelSliceExpected/bitSlice_c0_r349_rixx1003721.npy b/...isabled/testData/expected/eventScanParallelSliceExpected/bitSlice_c0_r349_rixx1003721.npy
diff --git a/...led/testData/expected/eventScanParallelSliceExpected/eventNumbers_c0_r349_rixx1003721.npy b/...led/testData/expected/eventScanParallelSliceExpected/eventNumbers_c0_r349_rixx1003721.npy
diff --git a/...s/disabled/testData/expected/eventScanParallelSliceExpected/means_c0_r349_rixx1003721.npy b/...s/disabled/testData/expected/eventScanParallelSliceExpected/means_c0_r349_rixx1003721.npy
diff --git a/...isabled/testData/expected/eventScanParallelSliceExpected/pulseIds_c0_r349_rixx1003721.npy b/...isabled/testData/expected/eventScanParallelSliceExpected/pulseIds_c0_r349_rixx1003721.npy
diff --git a/tests/disabled/testData/lowFlux/SimpleClusters_c0_r334_n100.h5 b/tests/disabled/testData/lowFlux/SimpleClusters_c0_r334_n100.h5
diff --git a/tests/disabled/testData/lowFlux/SimpleClusters_c0_r334_n100_part0.h5 b/tests/disabled/testData/lowFlux/SimpleClusters_c0_r334_n100_part0.h5
diff --git a/tests/test_scripts_beamtime.sh b/tests/test_scripts_beamtime.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# print cmds executed
+set -x
+
+cd ..
+source setup.sh
+cd suite_scripts
+export OUTPUT_ROOT=
+
+# create directories if they don't exist
+mkdir -p test_1
+mkdir -p test_2
+mkdir -p test_3
+
+# replace the following with commands for upcoming beamtime
+python CalcNoiseAndMean.py -r 583 -p ../test_1
+python LinearityPlotsParallelSlice.py -r 591 -p ../test_2
+python LinearityPlotsParallelSlice.py -r 591 -f ../test_2/LinearityPlotsParallel__c0_r591_n1.h5 --label fooBar -p ../test_2
+python analyze_npy.py ../test_2/LinearityPlotsParallel_r591_sliceFits_fooBar_raw.npy
+python TimeScanParallelSlice.py -r 498 -t 100 -p ../test_3
+python TimeScanParallelSlice.py -r 498 --threshold 0 -p ../test_3
+python MapCompEnOn.py -f ../test_3/TimeScanParallel__c0_r498_n1.h5