From 1b21cdcbaae94935b38ff06815b43b6e50d646af Mon Sep 17 00:00:00 2001 From: Hugo Buddelmeijer Date: Tue, 26 Sep 2023 17:02:25 +0200 Subject: [PATCH] Revert changes to extract_area_from_table and change mock data instead --- scopesim/optics/fov_utils.py | 8 ++++---- scopesim/tests/mocks/py_objects/source_objects.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scopesim/optics/fov_utils.py b/scopesim/optics/fov_utils.py index aecea41e..f6b1bd97 100644 --- a/scopesim/optics/fov_utils.py +++ b/scopesim/optics/fov_utils.py @@ -258,10 +258,10 @@ def extract_area_from_table(table, fov_volume): fov_xs = (fov_volume["xs"] * fov_unit).to(table["x"].unit) fov_ys = (fov_volume["ys"] * fov_unit).to(table["y"].unit) - mask = ((table["x"].data >= fov_xs[0].round(12).value) * - (table["x"].data <= fov_xs[1].round(12).value) * - (table["y"].data >= fov_ys[0].round(12).value) * - (table["y"].data <= fov_ys[1].round(12).value)) + mask = ((table["x"].data >= fov_xs[0].value) * + (table["x"].data < fov_xs[1].value) * + (table["y"].data >= fov_ys[0].value) * + (table["y"].data < fov_ys[1].value)) table_new = table[mask] return table_new diff --git a/scopesim/tests/mocks/py_objects/source_objects.py b/scopesim/tests/mocks/py_objects/source_objects.py index eef2fd63..a4f53b0f 100644 --- a/scopesim/tests/mocks/py_objects/source_objects.py +++ b/scopesim/tests/mocks/py_objects/source_objects.py @@ -28,7 +28,7 @@ def _table_source(): lookup_table=np.linspace(0, 4, n)[::-1] * unit)] tbl = Table(names=["x", "y", "ref", "weight"], data=[[5, 0, -5, 0]*u.arcsec, - [5, -10, 5, 0] * u.arcsec, + [5, -9, 5, 0] * u.arcsec, [2, 0, 1, 0], [1, 1, 1, 2]]) tbl_source = Source(table=tbl, spectra=specs)