Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions scopesim/effects/detector_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,6 @@ def apply_to(self, obj, **kwargs):
values=(tuple(zip(xy_sky.min(axis=0),
xy_sky.max(axis=0)))))

lims = array_minmax(xy_mm)
keys = ["xd_min", "xd_max", "yd_min", "yd_max"]
obj.detector_limits = dict(zip(keys, lims.T.flatten()))

return obj

def fov_grid(self, which="edges", **kwargs):
Expand Down
6 changes: 0 additions & 6 deletions scopesim/optics/fov_volume_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ def __init__(self, initial_volume=None):
},
}]
self.volumes[0].update(initial_volume) # .. TODO: Careful! This overwrites meta
self.detector_limits = {
"xd_min": 0,
"xd_max": 0,
"yd_min": 0,
"yd_max": 0,
}

def split(self, axis, value, aperture_id=None) -> None:
"""
Expand Down
9 changes: 0 additions & 9 deletions scopesim/tests/tests_optics/test_FOVManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,3 @@ def test_returns_n_fovs_for_smaller_chunk_size(self, chunk_size, n_fovs):
assert len(fovs) == 4
assert fov_skycorners.min(axis=0)[0] == approx(-1024 / 3600) # [deg] 2k detector / pixel_scale
assert fovs[0].waverange[0] == 0.6 * u.um # filter blue edge

def test_fov_volumes_have_detector_dimensions_from_detector_list(self):
effects = eo._mvs_effects_list()
fov_man = FOVManager(effects=effects, pixel_scale=1, plate_scale=1)
_ = list(fov_man.generate_fovs_list())
detector_limits = fov_man.volumes_list.detector_limits

assert detector_limits["xd_min"] != 0.0
assert detector_limits["yd_max"] != 0.0