Skip to content

Commit 3da655f

Browse files
Merge pull request #165 from michealroberts/test/optics/TestGetOpticalSystemThroughput
test: amend TestGetOpticalSystemThroughput in optics in celerity module
2 parents dd3493d + 2ce2fa5 commit 3da655f

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

tests/test_optics.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class TestGetOpticalSystemThroughput(unittest.TestCase):
2121
def test_all_elements_present(self):
2222
"""Test throughput with primary, secondary, lens, filter, and QE all valid."""
2323
T = get_optical_system_throughput(
24-
primary=SurfaceReflectance({"reflectivity": 0.92}),
25-
secondary=SurfaceReflectance({"reflectivity": 0.90}),
24+
primary=SurfaceReflectance({"albedo": 0.92}),
25+
secondary=SurfaceReflectance({"albedo": 0.90}),
2626
lens=Transmission({"coefficient": 0.98}),
2727
filter=Transmission({"coefficient": 0.85}),
2828
QE=0.80,
@@ -31,42 +31,42 @@ def test_all_elements_present(self):
3131
self.assertAlmostEqual(T, expected, places=9)
3232

3333
def test_without_secondary(self):
34-
"""Test throughput when secondary is omitted (reflectivity=1.0)."""
34+
"""Test throughput when secondary is omitted (albedo=1.0)."""
3535
T = get_optical_system_throughput(
36-
primary=SurfaceReflectance({"reflectivity": 0.95}),
36+
primary=SurfaceReflectance({"albedo": 0.95}),
3737
lens=Transmission({"coefficient": 0.99}),
3838
filter=Transmission({"coefficient": 0.90}),
3939
QE=0.75,
4040
)
4141
expected = 0.95 * 1.0 * 0.99 * 0.90 * 0.75
4242
self.assertAlmostEqual(T, expected, places=9)
4343

44-
def test_invalid_primary_reflectivity_negative(self):
45-
"""Primary reflectivity < 0 should raise ValueError."""
44+
def test_invalid_primary_albedo_negative(self):
45+
"""Primary albedo < 0 should raise ValueError."""
4646
with self.assertRaises(ValueError):
4747
get_optical_system_throughput(
48-
primary=SurfaceReflectance({"reflectivity": -0.1}),
48+
primary=SurfaceReflectance({"albedo": -0.1}),
4949
lens=Transmission({"coefficient": 0.90}),
5050
filter=Transmission({"coefficient": 0.90}),
5151
QE=0.90,
5252
)
5353

54-
def test_invalid_primary_reflectivity_gt_one(self):
55-
"""Primary reflectivity > 1 should raise ValueError."""
54+
def test_invalid_primary_albedo_gt_one(self):
55+
"""Primary albedo > 1 should raise ValueError."""
5656
with self.assertRaises(ValueError):
5757
get_optical_system_throughput(
58-
primary=SurfaceReflectance({"reflectivity": 1.1}),
58+
primary=SurfaceReflectance({"albedo": 1.1}),
5959
lens=Transmission({"coefficient": 0.90}),
6060
filter=Transmission({"coefficient": 0.90}),
6161
QE=0.90,
6262
)
6363

64-
def test_invalid_secondary_reflectivity(self):
65-
"""Secondary reflectivity outside [0,1] should raise ValueError."""
64+
def test_invalid_secondary_albedo(self):
65+
"""Secondary albedo outside [0,1] should raise ValueError."""
6666
with self.assertRaises(ValueError):
6767
get_optical_system_throughput(
68-
primary=SurfaceReflectance({"reflectivity": 0.90}),
69-
secondary=SurfaceReflectance({"reflectivity": 1.2}),
68+
primary=SurfaceReflectance({"albedo": 0.90}),
69+
secondary=SurfaceReflectance({"albedo": 1.2}),
7070
lens=Transmission({"coefficient": 0.90}),
7171
filter=Transmission({"coefficient": 0.90}),
7272
QE=0.90,
@@ -76,7 +76,7 @@ def test_invalid_lens_transmission(self):
7676
"""Lens transmission coefficient < 0 should raise ValueError."""
7777
with self.assertRaises(ValueError):
7878
get_optical_system_throughput(
79-
primary=SurfaceReflectance({"reflectivity": 0.90}),
79+
primary=SurfaceReflectance({"albedo": 0.90}),
8080
lens=Transmission({"coefficient": -0.2}),
8181
filter=Transmission({"coefficient": 0.90}),
8282
QE=0.90,
@@ -86,7 +86,7 @@ def test_invalid_filter_transmission(self):
8686
"""Filter transmission coefficient > 1 should raise ValueError."""
8787
with self.assertRaises(ValueError):
8888
get_optical_system_throughput(
89-
primary=SurfaceReflectance({"reflectivity": 0.90}),
89+
primary=SurfaceReflectance({"albedo": 0.90}),
9090
lens=Transmission({"coefficient": 0.90}),
9191
filter=Transmission({"coefficient": 1.5}),
9292
QE=0.90,
@@ -96,7 +96,7 @@ def test_invalid_qe(self):
9696
"""Quantum efficiency outside [0,1] should raise ValueError."""
9797
with self.assertRaises(ValueError):
9898
get_optical_system_throughput(
99-
primary=SurfaceReflectance({"reflectivity": 0.90}),
99+
primary=SurfaceReflectance({"albedo": 0.90}),
100100
lens=Transmission({"coefficient": 0.90}),
101101
filter=Transmission({"coefficient": 0.90}),
102102
QE=1.2,

0 commit comments

Comments
 (0)