Updated sofast examples to use new file locations.

sandialabs · Apr 1, 2024 · aa68056 · aa68056
1 parent 76c6788
commit aa68056
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/example/sofast_calibration/example_calibration_spatial_orientation.py b/example/sofast_calibration/example_calibration_spatial_orientation.py
@@ -34,7 +34,8 @@ def example_camera_position_calibration():
 
     # Define inputs
     file_camera_sofast = join(opencsp_code_dir(), 'test/data/sofast_common/camera_sofast.h5')
-    file_cal_image = join(opencsp_code_dir(), 'test/data/camera_position_calibration/image_sofast_camera.png')
+    file_cal_image = join(opencsp_code_dir(),
+                          'test/data/camera_position_calibration/data_measurement/image_sofast_camera.png')
     file_pts_data = join(opencsp_code_dir(), 'test/data/sofast_common/aruco_corner_locations.csv')
 
     # 1. Load measured calibration data

diff --git a/example/sofast_fringe/example_process_facet_ensemble.py b/example/sofast_fringe/example_process_facet_ensemble.py
@@ -45,11 +45,11 @@ def example_process_facet_ensemble():
     dir_data_common = join(opencsp_code_dir(), 'test/data/sofast_common')
 
     # Directory setup
-    file_measurement = join(dir_data_sofast, 'measurement_ensemble.h5')
+    file_measurement = join(dir_data_sofast, 'data_measurement/measurement_ensemble.h5')
     file_camera = join(dir_data_common, 'camera_sofast_downsampled.h5')
     file_display = join(dir_data_common, 'display_distorted_2d.h5')
     file_orientation = join(dir_data_common, 'spatial_orientation.h5')
-    file_calibration = join(dir_data_sofast, 'image_calibration.h5')
+    file_calibration = join(dir_data_sofast, 'data_measurement/image_calibration.h5')
     file_facet = join(dir_data_common, 'Facet_lab_6x4.json')
     file_ensemble = join(dir_data_common, 'Ensemble_lab_6x4.json')
 

diff --git a/example/sofast_fringe/example_process_single_facet.py b/example/sofast_fringe/example_process_single_facet.py
@@ -42,11 +42,11 @@ def example_process_single_facet():
     dir_data_common = join(opencsp_code_dir(), 'test/data/sofast_common')
 
     # Directory Setup
-    file_measurement = join(dir_data_sofast, 'measurement_facet.h5')
+    file_measurement = join(dir_data_sofast, 'data_measurement/measurement_facet.h5')
     file_camera = join(dir_data_common, 'camera_sofast_downsampled.h5')
     file_display = join(dir_data_common, 'display_distorted_2d.h5')
     file_orientation = join(dir_data_common, 'spatial_orientation.h5')
-    file_calibration = join(dir_data_sofast, 'image_calibration.h5')
+    file_calibration = join(dir_data_sofast, 'data_measurement/image_calibration.h5')
     file_facet = join(dir_data_common, 'Facet_NSTTF.json')
 
     # 1. Load saved single facet Sofast collection data

diff --git a/example/sofast_fringe/example_process_undefined_shape.py b/example/sofast_fringe/example_process_undefined_shape.py
@@ -41,11 +41,11 @@ def example_process_undefined_shape_facet():
     dir_data_common = join(opencsp_code_dir(), 'test/data/sofast_common')
 
     # Directory Setup
-    file_measurement = join(dir_data_sofast, 'measurement_facet.h5')
+    file_measurement = join(dir_data_sofast, 'data_measurement/measurement_facet.h5')
     file_camera = join(dir_data_common, 'camera_sofast_downsampled.h5')
     file_display = join(dir_data_common, 'display_distorted_2d.h5')
     file_orientation = join(dir_data_common, 'spatial_orientation.h5')
-    file_calibration = join(dir_data_sofast, 'image_calibration.h5')
+    file_calibration = join(dir_data_sofast, 'data_measurement/image_calibration.h5')
 
     # 1. Load saved single facet Sofast collection data
     # =================================================

diff --git a/example/sofast_fringe/example_standard_mirror_plot_output.py b/example/sofast_fringe/example_standard_mirror_plot_output.py
@@ -34,7 +34,7 @@ def example_single_facet() -> None:
     ft.create_directories_if_necessary(dir_save)
 
     # Define data file
-    file_data = join(opencsp_code_dir(), 'test/data/sofast_fringe/calculations_facet/data.h5')
+    file_data = join(opencsp_code_dir(), 'test/data/sofast_fringe/data_expected_facet/data.h5')
 
     # 1. Load Sofast measurement data
     # ===============================
@@ -99,7 +99,7 @@ def example_facet_ensemble() -> None:
     ft.create_directories_if_necessary(dir_save)
 
     # Define data file
-    file_data = join(opencsp_code_dir(), 'test/data/sofast_fringe/calculations_facet_ensemble/data.h5')
+    file_data = join(opencsp_code_dir(), 'test/data/sofast_fringe/data_expected_facet_ensemble/data.h5')
 
     # 1. Load Sofast measurement data
     # ===============================