From bddd3761163d303f6383e7e8dc9dd957fc32c861 Mon Sep 17 00:00:00 2001 From: Will Barnes Date: Thu, 31 Aug 2023 15:46:57 -0400 Subject: [PATCH] Check multiple SSW mirrors for remote psf files (#178) * check multiple ssw mirrors for remote psf files * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- xrtpy/util/__init__.py | 5 +++++ xrtpy/util/xrt_deconvolve.py | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xrtpy/util/__init__.py b/xrtpy/util/__init__.py index 449e228e..771b7f57 100644 --- a/xrtpy/util/__init__.py +++ b/xrtpy/util/__init__.py @@ -5,3 +5,8 @@ "epoch", "time", ] + +_SSW_MIRRORS = [ + "https://sohoftp.nascom.nasa.gov/solarsoft/", + "https://hesperia.gsfc.nasa.gov/ssw/", +] diff --git a/xrtpy/util/xrt_deconvolve.py b/xrtpy/util/xrt_deconvolve.py index 4a182e9c..23e7637f 100644 --- a/xrtpy/util/xrt_deconvolve.py +++ b/xrtpy/util/xrt_deconvolve.py @@ -11,19 +11,24 @@ from sunpy.image.resample import resample from sunpy.image.transform import affine_transform from sunpy.map import Map +from urllib.parse import urljoin + +from xrtpy.util import _SSW_MIRRORS @manager.require( "PSF560.fits", [ - "https://sohoftp.nascom.nasa.gov/solarsoft/hinode/xrt/idl/util/XRT20170324_151721.0.PSF560.fits" + urljoin(mirror, "hinode/xrt/idl/util/XRT20170324_151721.0.PSF560.fits") + for mirror in _SSW_MIRRORS ], "0eaa5da6fb69661e7f46d1f0c463e4b3b1745426a399a4fbc53fc0c0ae87dd0d", ) @manager.require( "PSF1000.fits", [ - "https://sohoftp.nascom.nasa.gov/solarsoft/hinode/xrt/idl/util/XRT20170324_161721.0.PSF1000.fits" + urljoin(mirror, "hinode/xrt/idl/util/XRT20170324_161721.0.PSF1000.fits") + for mirror in _SSW_MIRRORS ], "95590a7174692977a2f111b932811c9c7ae105a59b93bfe6c96fba862cefacf1", )