Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/improved zemax reader #38

Merged
merged 17 commits into from
Jan 26, 2025
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
69e8c78
fix: add wavelength range validation in AbbeMaterial class
HarrisonKramer Dec 9, 2024
f9c86c7
test: add unit test for wavelength out of bounds in AbbeMaterial class
HarrisonKramer Dec 9, 2024
5dbc41b
fix: handle comma as decimal separator in Zemax file reader
HarrisonKramer Dec 9, 2024
514b93c
feat: enhance LensInfoViewer to display AbbeMaterial properties
HarrisonKramer Dec 9, 2024
c8b7c39
Merge branch 'master' into feat/improved_zemax_reader
HarrisonKramer Dec 14, 2024
ffb3d52
Merge branch 'master' into feat/improved_zemax_reader
HarrisonKramer Dec 15, 2024
95e9ed4
Merge branch 'master' into feat/improved_zemax_reader
HarrisonKramer Dec 28, 2024
92f4b28
Merge branch 'master' into feat/improved_zemax_reader
HarrisonKramer Jan 9, 2025
6dd6639
Merge branch 'master' into feat/improved_zemax_reader
HarrisonKramer Jan 12, 2025
3b28480
feat: add support for reading additional Zemax file parameters
HarrisonKramer Jan 22, 2025
02ee335
feat: enhance ZemaxToOpticConverter to support vignette parameters an…
HarrisonKramer Jan 22, 2025
31bb583
test: add tests for reading vignette parameters in ZemaxFileReader
HarrisonKramer Jan 22, 2025
2b686dc
test: add test for configuring vignette fields in ZemaxFileReader
HarrisonKramer Jan 25, 2025
fed98a4
test: add test for configuring vignette decenter fields in ZemaxToOpt…
HarrisonKramer Jan 26, 2025
46ebbfd
test: add test to verify warning for LITHOTEC-CAF2 material
HarrisonKramer Jan 26, 2025
f419b83
chore: exclude generate_csv_database.py from test coverage
HarrisonKramer Jan 26, 2025
5044797
chore: remove coverage exclusion for generate_csv_database.py
HarrisonKramer Jan 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: add test for configuring vignette fields in ZemaxFileReader
HarrisonKramer committed Jan 25, 2025
commit 2b686dcc85b16641d295a5f2b9a557a7ba51b7fb
7 changes: 7 additions & 0 deletions tests/test_fileio.py
Original file line number Diff line number Diff line change
@@ -289,6 +289,13 @@ def test_generate_lens_with_invalid_mode(self, zemax_file_reader):
with pytest.raises(ValueError, match='Unsupported surface type.'):
zemax_file_reader.generate_lens()

def test_configure_fields(self, zemax_file_reader):
vig = [0.5, 0.5, 0.5]
zemax_file_reader.data['fields']['vignette_compress_x'] = vig
zemax_file_reader.data['fields']['vignette_compress_y'] = vig
lens = zemax_file_reader.generate_lens()
assert lens.fields.get_vig_factor(Hx=0, Hy=1) == (0.5, 0.5)


def test_save_load_json_obj():
mat = Material('SF11')

Unchanged files with check annotations Beta

try:
dx = self.data['fields']['vignette_decenter_x']
dy = self.data['fields']['vignette_decenter_y']

Check warning on line 110 in optiland/fileio/converters.py

Codecov / codecov/patch

optiland/fileio/converters.py#L110

Added line #L110 was not covered by tests
# TODO: Implement decentering.
if any(dx) or any(dy):
print('Warning: Vignette decentering is not supported.')

Check warning on line 114 in optiland/fileio/converters.py

Codecov / codecov/patch

optiland/fileio/converters.py#L113-L114

Added lines #L113 - L114 were not covered by tests
except KeyError:
pass