Skip to content

Commit

Permalink
Updated calls to lshd methods.
Browse files Browse the repository at this point in the history
  • Loading branch information
braden6521 committed Aug 19, 2024
1 parent 7885ea7 commit cf4b25b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
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 @@ -37,8 +37,8 @@ def example_single_facet() -> None:

# 1. Load Sofast measurement data
# ===============================
optic_meas = lsd.load_mirror_from_hdf(file_data)
optic_ref = lsd.load_ideal_mirror_from_hdf(file_data, 100.0)
optic_meas = lsd.load_mirror(file_data)
optic_ref = lsd.load_mirror_ideal(file_data, 100.0)

# 2. Define viewing/illumination geometry
# =======================================
Expand Down
8 changes: 4 additions & 4 deletions opencsp/app/sofast/test/test_load_sofast_hdf_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ def setUpClass(cls):
cls.file_fixed = join(opencsp_code_dir(), 'test/data/sofast_fixed/data_expected/calculation_facet.h5')

def test_load_fringe(self):
lsd.load_single_mirror(self.file_fringe)
lsd.load_mirror(self.file_fringe)

def test_load_fringe_ideal(self):
lsd.load_single_mirror_ideal_parabolic(self.file_fringe, 100.0)
lsd.load_mirror_ideal(self.file_fringe, 100.0)

def test_load_fixed(self):
lsd.load_single_mirror(self.file_fixed)
lsd.load_mirror(self.file_fixed)

def test_load_fixed_ideal(self):
lsd.load_single_mirror_ideal_parabolic(self.file_fixed, 100.0)
lsd.load_mirror_ideal(self.file_fixed, 100.0)


if __name__ == '__main__':
Expand Down
4 changes: 2 additions & 2 deletions opencsp/common/lib/csp/test/test_StandardPlotOutput.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ def test_facet(self):
file_data = join(opencsp_code_dir(), 'test/data/sofast_fringe/data_expected_facet/data.h5')

# Load Sofast measurement data
optic_meas = lsd.load_mirror_from_hdf(file_data)
optic_ref = lsd.load_ideal_mirror_from_hdf(file_data, 100.0)
optic_meas = lsd.load_mirror(file_data)
optic_ref = lsd.load_mirror_ideal(file_data, 100.0)

# Define viewing/illumination geometry
v_target_center = Vxyz((0, 0, 100))
Expand Down

0 comments on commit cf4b25b

Please sign in to comment.