diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 62c0d80..c7ba232 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: rev: 5.13.2 hooks: - id: isort - exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|extern.*|)$" + exclude: ".*(.fits|.fts|.fit|.header|.txt|tca.*|extern.*)$" - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.5.0 hooks: diff --git a/examples/imaging_demo.py b/examples/imaging_demo.py index 04b0fed..444439c 100644 --- a/examples/imaging_demo.py +++ b/examples/imaging_demo.py @@ -12,27 +12,30 @@ """ import logging + import astropy.units as u import matplotlib.pyplot as plt import numpy as np -# from astropy.coordinates import SkyCoord -# from astropy.time import Time -# from sunpy.map import make_fitswcs_header, Map +from xrayvision.clean import vis_clean +from xrayvision.imaging import vis_to_image, vis_to_map +from xrayvision.mem import mem +from xrayvision.visibility import Visibility -# from stixpy.frames import get_hpc_info -from stixpy.imaging.em import em from stixpy.calibration.visibility import ( calibrate_visibility, create_meta_pixels, create_visibility, get_uv_points_data, ) +# from stixpy.frames import get_hpc_info +from stixpy.imaging.em import em from stixpy.product import Product -from xrayvision.clean import vis_clean -from xrayvision.imaging import vis_to_image, vis_to_map -from xrayvision.mem import mem -from xrayvision.visibility import Visibility +# from astropy.coordinates import SkyCoord +# from astropy.time import Time +# from sunpy.map import make_fitswcs_header, Map + + logger = logging.getLogger(__name__) logger.setLevel("DEBUG") diff --git a/stixpy/calibration/tests/test_visibility.py b/stixpy/calibration/tests/test_visibility.py index 4e0d57f..e0b8d11 100644 --- a/stixpy/calibration/tests/test_visibility.py +++ b/stixpy/calibration/tests/test_visibility.py @@ -1,6 +1,11 @@ +import astropy.units as u + from stixpy.calibration.visibility import get_uv_points_data def test_get_uv_points_data(): uv_data = get_uv_points_data() - assert True + assert uv_data['u'][0] == -0.03333102271709666 / u.arcsec + assert uv_data['v'][0] == 0.005908224739704219 / u.arcsec + assert uv_data['isc'][0] == 1 + assert uv_data['label'][0] == '3c' diff --git a/stixpy/calibration/visibility.py b/stixpy/calibration/visibility.py index ec9654b..745b78c 100644 --- a/stixpy/calibration/visibility.py +++ b/stixpy/calibration/visibility.py @@ -271,10 +271,10 @@ def get_uv_points_data(d_det=47.78 * u.mm, d_sep=545.30 * u.mm): ---------- d_det: astropy Quantity Distance between the rear grid and the detector plane (in mm). Default, 47.78 * u.mm - + d_sep: astropy Quantity Distance between the front and the rear grid (in mm). Default, 545.30 * u.mm - + Returns ------- A dictionary containing sub-collimator indices, sub-collimator labels and coordinates of the STIX (u,v) points (defined in arcsec^-1) @@ -285,7 +285,7 @@ def get_uv_points_data(d_det=47.78 * u.mm, d_sep=545.30 * u.mm): https://doi.org/10.1007/s11207-023-02205-7 """ - + subc = read_subc_params() imaging_ind = np.where((subc["Grid Label"] != "cfl") & (subc["Grid Label"] != "bkg")) @@ -323,7 +323,7 @@ def get_uv_points_data(d_det=47.78 * u.mm, d_sep=545.30 * u.mm): } return uv_data - + def calibrate_visibility(vis, flare_location=(0, 0) * u.arcsec): """ @@ -386,7 +386,7 @@ def calibrate_visibility(vis, flare_location=(0, 0) * u.arcsec): ) return cal_vis - + def sas_map_center(): # receter map at 0,0 taking account of mean or actual sas sol diff --git a/stixpy/tests/test_science.py b/stixpy/tests/test_science.py index 916340e..cf7a95b 100644 --- a/stixpy/tests/test_science.py +++ b/stixpy/tests/test_science.py @@ -4,12 +4,7 @@ from numpy.testing import assert_allclose from stixpy.product import Product -from stixpy.product.sources.science import ( - CompressedPixelData, - RawPixelData, - Spectrogram, - SummedCompressedPixelData, -) +from stixpy.product.sources.science import CompressedPixelData, RawPixelData, Spectrogram, SummedCompressedPixelData @pytest.mark.remote_data