Skip to content

Commit

Permalink
Made Black happy
Browse files Browse the repository at this point in the history
  • Loading branch information
braden6521 committed Mar 29, 2024
1 parent ed6cb6b commit fbcb5b9
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 12 deletions.
14 changes: 10 additions & 4 deletions example/sofast_fringe/example_calibration_screen_shape.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,18 @@ def example_screen_shape_calibration():
# Define input files
file_pts_data = join(opencsp_code_dir(), 'test/data/sofast_common/aruco_corner_locations.csv')
file_screen_cal_point_pairs = join(
opencsp_code_dir(), 'test/data/display_shape_calibration/data_measurement/screen_calibration_point_pairs.csv')
opencsp_code_dir(), 'test/data/display_shape_calibration/data_measurement/screen_calibration_point_pairs.csv'
)
file_camera_distortion = join(
opencsp_code_dir(), 'test/data/display_shape_calibration/data_measurement/camera_screen_shape.h5')
opencsp_code_dir(), 'test/data/display_shape_calibration/data_measurement/camera_screen_shape.h5'
)
file_image_projection = join(opencsp_code_dir(), 'test/data/sofast_common/image_projection.h5')
files_screen_shape_measurement = glob(join(
opencsp_code_dir(), 'test/data/display_shape_calibration/data_measurement/screen_shape_sofast_measurements/pose_*.h5'))
files_screen_shape_measurement = glob(
join(
opencsp_code_dir(),
'test/data/display_shape_calibration/data_measurement/screen_shape_sofast_measurements/pose_*.h5'
)
)

# Load output data from Scene Reconstruction (Aruco marker xyz points)
pts_marker_data = np.loadtxt(file_pts_data, delimiter=',', skiprows=1)
Expand Down
4 changes: 2 additions & 2 deletions example/sofast_fringe/example_standard_mirror_plot_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def example_single_facet() -> None:

# Load data
optic_meas = lsd.load_facet_from_hdf(file_data)
optic_ref = lsd.load_ideal_facet_from_hdf(file_data, 100.)
optic_ref = lsd.load_ideal_facet_from_hdf(file_data, 100.0)

# Define scene
v_target_center = Vxyz((0, 0, 56.57))
Expand Down Expand Up @@ -84,7 +84,7 @@ def example_facet_ensemble() -> None:

# Load data
optic_meas = lsd.load_facet_ensemble_from_hdf(file_data)
optic_ref = lsd.load_ideal_facet_ensemble_from_hdf(file_data, 1000.)
optic_ref = lsd.load_ideal_facet_ensemble_from_hdf(file_data, 1000.0)

# Define scene
v_target_center = Vxyz((0, 0, 56.57))
Expand Down
5 changes: 3 additions & 2 deletions opencsp/app/sofast/test/test_CalibrateDisplayShape.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ def setUpClass(cls):
file_image_projection = join(opencsp_code_dir(), 'test/data/sofast_common/image_projection.h5')
files_screen_shape_measurement = glob(join(dir_meas_data, 'screen_shape_sofast_measurements/pose_*.h5'))
files_screen_shape_measurement.sort()
file_exp = join(opencsp_code_dir(),
'test/data/display_shape_calibration/data_expected/screen_distortion_data_100_100.h5')
file_exp = join(
opencsp_code_dir(), 'test/data/display_shape_calibration/data_expected/screen_distortion_data_100_100.h5'
)

# Load input data
pts_marker_data = np.loadtxt(file_point_locations, delimiter=',', dtype=float, skiprows=1)
Expand Down
4 changes: 1 addition & 3 deletions opencsp/app/sofast/test/test_project_fixed_pattern_target.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ class TestProjectFixedPatternTarget(unittest.TestCase):
@pytest.mark.no_xvfb
def test_project_fixed_pattern_target(self):
# Set pattern parameters
file_image_projection = os.path.join(
opencsp_code_dir(), "test/data/sofast_common/image_projection_test.h5"
)
file_image_projection = os.path.join(opencsp_code_dir(), "test/data/sofast_common/image_projection_test.h5")

# Load ImageProjection
im_proj = ImageProjection.load_from_hdf_and_display(file_image_projection)
Expand Down
3 changes: 2 additions & 1 deletion opencsp/common/lib/deflectometry/test/test_SlopeSolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ def test_transform_alignment(self):

def test_int_pts(self):
data = h5.load_hdf5_datasets(
['DataSofastCalculation/facet/facet_000/v_surf_points_facet'], self.data_file_facet)
['DataSofastCalculation/facet/facet_000/v_surf_points_facet'], self.data_file_facet
)
np.testing.assert_allclose(
data['v_surf_points_facet'], self.data_slope.v_surf_points_facet.data, atol=1e-8, rtol=0
)
Expand Down

0 comments on commit fbcb5b9

Please sign in to comment.