added SystemSofastFixed

contrib/app/sofast/README.md

@@ -2,12 +2,12 @@
 
 Code under this directory is not actively maintained by the OpenCSP team.
 
-These examples require additional hardware and data.
+This is experimental code, still in early stages of exploration and development.
 
-The Sofast Contributed example suite contains examples on how to use Sofast to collect data.
+These examples require additional hardware and data.
 
 ## Example file description:
 | File | Description |
 | :--- | :--- |
-| run_and_characterize_sofast_1_cam.py | Runs Sofast (requires camera/projector/etc.) with a single camera and characterizes data as a single facet data collection. |
-| run_and_characterize_sofast_2_cam.py | Runs Sofast (requires two cameras/projector/etc.) with two cameras simultaneously and characterizes data as a single facet data collection |
+| load_saved_data.py | Loads saved SofastFringe data from HDF5 file. |
+| sofast_command_line_interface.py | Sofast Fixed and Fringe command line interface. |

contrib/app/sofast/run_fixed_pattern_projection.py

@@ -4,7 +4,7 @@
 
 from os.path import join
 
-from opencsp.app.sofast.lib.SystemSofastFixed import SystemSofastFixed
+from opencsp.app.sofast.lib.PatternSofastFixed import PatternSofastFixed
 from opencsp.common.lib.opencsp_path.opencsp_root_path import opencsp_code_dir
 from opencsp.common.lib.deflectometry.ImageProjection import ImageProjection
 
@@ -21,10 +21,10 @@ def run_fixed_pattern_projection():
  # Define SofastFixedPattern object
  width_pattern = 3
  spacing_pattern = 6
- fixed_pattern = SystemSofastFixed(im_proj.size_x, im_proj.size_y, width_pattern, spacing_pattern)
+ fixed_pattern = PatternSofastFixed(im_proj.size_x, im_proj.size_y, width_pattern, spacing_pattern)
+ image = fixed_pattern.get_image('uint8', 255, 'square')
 
  # Project image (press escape to close window)
- image = fixed_pattern.get_image('uint8', 255, 'circle')
  im_proj.display_image_in_active_area(image)
  im_proj.run()