Everything else

Author: nabobalis

aiapy/calibrate/tests/test_prep.py

@@ -230,7 +230,6 @@ def test_degradation_4500_missing() -> None:
         degradation(4500 * u.angstrom, obstime, correction_table=get_correction_table(10))
 
 
-@pytest.mark.xfail(reason="JSOC is down")
 @pytest.mark.remote_data
 def test_degradation_4500_jsoc() -> None:
     # 4500 has a max version of 3, so by default it will error

aiapy/calibrate/tests/test_util.py

@@ -94,7 +94,6 @@ def test_obstime_out_of_range() -> None:
 
 
 @pytest.mark.remote_data
-@pytest.mark.xfail(reason="JSOC is down")
 def test_pointing_table() -> None:
     expected_columns = ["T_START", "T_STOP"]
     for c in ["094", "171", "193", "211", "304", "335", "1600", "1700", "4500"]:
@@ -118,11 +117,10 @@ def test_pointing_table() -> None:
 
 
 @pytest.mark.remote_data
-@pytest.mark.xfail(reason="JSOC is down")
 def test_pointing_table_unavailable() -> None:
     # Check that missing pointing data raises a nice error
     t = astropy.time.Time("1990-01-01")
-    with pytest.raises(RuntimeError, match="Could not find any pointing information"):
+    with pytest.raises(RuntimeError, match="No data found for this query"):
         get_pointing_table("jsoc", start=t - 3 * u.h, end=t + 3 * u.h)
 
 

aiapy/calibrate/util.py

@@ -198,7 +198,7 @@ def get_correction_table(source):
 
 @u.quantity_input
 @validate_channel("channel")
-def _select_epoch_from_correction_table(channel: u.angstrom, obstime, table):
+def _select_epoch_from_correction_table(channel: u.angstrom, obstime, correction_table):
     """
     Return correction table with only the first epoch and the epoch in which
     ``obstime`` falls and for only one given calibration version.
@@ -207,14 +207,14 @@ def _select_epoch_from_correction_table(channel: u.angstrom, obstime, table):
     ----------
     channel : `~astropy.units.Quantity`
     obstime : `~astropy.time.Time`
-    table : `~astropy.table.QTable`
+    correction_table : `~astropy.table.QTable`
     """
     # Select only this channel
     # NOTE: The WAVE_STR prime keys for the aia.response JSOC series for the
     # non-EUV channels do not have a thick/thin designation
     thin = "_THIN" if channel not in (1600, 1700, 4500) * u.angstrom else ""
     wave = channel.to(u.angstrom).value
-    table = table[table["WAVE_STR"] == f"{wave:.0f}{thin}"]
+    table = correction_table[correction_table["WAVE_STR"] == f"{wave:.0f}{thin}"]
     table.sort("DATE")  # Newest entries will be last
     if len(table) == 0:
         extra_msg = " Max version is 3." if channel == 4500 * u.AA else ""
@@ -289,7 +289,9 @@ def get_pointing_table(source, *, start=None, end=None):
         if start is None or end is None:
             msg = "start and end must be provided if source is 'jsoc'"
             raise ValueError(msg)
-        table = get_data_from_jsoc(query=f"aia.master_pointing3h[{start.isot}Z-{end.isot}Z]", key="**ALL**")
+        table = QTable.from_pandas(
+            get_data_from_jsoc(query=f"aia.master_pointing3h[{start.isot}Z-{end.isot}Z]", key="**ALL**")
+        )
     elif source.lower() == "lmsal":
         table = QTable(astropy_ascii.read(fetch_pointing_table()))
     else:

aiapy/response/channel.py

@@ -15,7 +15,7 @@
 
 from aiapy import _SSW_MIRRORS
 from aiapy.calibrate import degradation
-from aiapy.calibrate.util import _select_epoch_from_correction_table, get_correction_table
+from aiapy.calibrate.util import _select_epoch_from_correction_table
 from aiapy.data._manager import manager
 from aiapy.util import telescope_number
 from aiapy.util.decorators import validate_channel
@@ -282,7 +282,7 @@ def crosstalk(
         return u.Quantity(np.zeros(self.wavelength.shape), u.cm**2)
 
     @u.quantity_input
-    def eve_correction(self, obstime, source) -> u.dimensionless_unscaled:
+    def eve_correction(self, obstime, correction_table) -> u.dimensionless_unscaled:
         r"""
         Correct effective area to give good agreement with full-disk EVE data.
 
@@ -306,8 +306,9 @@ def eve_correction(self, obstime, source) -> u.dimensionless_unscaled:
         ----------
         obstime : `~astropy.time.Time`
             The time of the observation.
-        source : `pathlib.Path` or `str` or `int`, optional
-            TODO: UPDATE
+        correction_table : `astropy.table.QTable`
+            Table of correction parameters.
+            See `aiapy.calibrate.util.get_correction_table` for more information.
 
         Returns
         -------
@@ -320,7 +321,7 @@ def eve_correction(self, obstime, source) -> u.dimensionless_unscaled:
         table = _select_epoch_from_correction_table(
             self.channel,
             obstime,
-            get_correction_table(source=source),
+            correction_table=correction_table,
         )
         effective_area_interp = np.interp(table["EFF_WVLN"][-1], self.wavelength, self.effective_area)
         return table["EFF_AREA"][0] / effective_area_interp
@@ -360,7 +361,7 @@ def wavelength_response(
         obstime=None,
         include_eve_correction=False,
         include_crosstalk=True,
-        **kwargs,
+        correction_table,
     ) -> u.DN / u.ph * u.cm**2:
         r"""
         The wavelength response function is the product of the gain and the
@@ -393,9 +394,8 @@ def wavelength_response(
             The time-dependent correction is also included.
         include_crosstalk : `bool`, optional
             If true, include the effect of crosstalk between channels that share a telescope
-        correction_table : `~astropy.table.Table` or `str`, optional
-            Table of correction parameters or path to correction table file.
-            If not specified, it will be queried from JSOC.
+        correction_table : `~astropy.table.Table`
+            Table of correction parameters.
             See `aiapy.calibrate.util.get_correction_table` for more information.
 
         Returns
@@ -412,8 +412,8 @@ def wavelength_response(
         """
         eve_correction, time_correction = 1, 1
         if obstime is not None:
-            time_correction = degradation(self.channel, obstime, **kwargs)
+            time_correction = degradation(self.channel, obstime, correction_table=correction_table)
             if include_eve_correction:
-                eve_correction = self.eve_correction(obstime, **kwargs)
+                eve_correction = self.eve_correction(obstime, correction_table=correction_table)
         crosstalk = self.crosstalk if include_crosstalk else 0 * u.cm**2
         return (self.effective_area + crosstalk) * self.gain * time_correction * eve_correction

aiapy/util/net.py

@@ -36,14 +36,11 @@ def get_data_from_jsoc(query, *, key, seg=None):
         If the query fails for any reason.
     """
     try:
-        return drms.Client().query(query, key=key, seg=seg)
-    except KeyError as e:
-        # This probably should not be here but yolo.
-        # If there's no pointing information available between these times,
-        # JSOC will raise a cryptic KeyError
-        # (see https://github.com/LM-SAL/aiapy/issues/71)
-        msg = "Could not find any pointing information"
-        raise RuntimeError(msg) from e
+        jsoc_result = drms.Client().query(query, key=key, seg=seg)
     except Exception as e:
         msg = f"Unable to query the JSOC.\n Error message: {e}"
         raise OSError(msg) from e
+    if len(jsoc_result) == 0:
+        msg = f"No data found for this query: {query}, key: {key}, seg: {seg}"
+        raise RuntimeError(msg)
+    return jsoc_result

aiapy/util/tests/test_net.py

@@ -4,9 +4,8 @@
 
 
 @pytest.mark.remote_data
-@pytest.mark.xfail(reason="JSOC is currently down")
 def test_get_data_from_jsoc():
-    assert get_data_from_jsoc("aia.lev1[2001-01-01]", key="T_OBS") is not None
+    assert get_data_from_jsoc("aia.master_pointing3h[2010-05-13T00:00:00Z]", key="**ALL**") is not None
 
 
 def test_get_data_from_jsoc_error():

aiapy/util/tests/test_util.py

@@ -16,5 +16,8 @@ def test_sdo_location(aia_171_map) -> None:
 @pytest.mark.remote_data
 def test_sdo_location_raises_error() -> None:
     # Confirm that an error is raised for a time without records
-    with pytest.raises(ValueError, match="No JSOC records near this time: 2001-01-01T00:00:00.000"):
+    with pytest.raises(
+        RuntimeError,
+        match="No data found for this query: aia.lev1[2000-12-31T23:59:57.000/6s], key: T_OBS, HAEX_OBS, HAEY_OBS, HAEZ_OBS, seg: None",
+    ):
         aiapy.util.sdo_location("2001-01-01")

examples/calculate_response_function.py

@@ -14,6 +14,7 @@
 import astropy.time
 import astropy.units as u
 
+from aiapy.calibrate.util import get_correction_table
 from aiapy.response import Channel
 
 ###############################################################################
@@ -94,7 +95,8 @@
 # Additionally, `aiapy.response.Channel` provides a method for calculating
 # the wavelength response function using the equation above,
 
-wavelength_response_335 = aia_335_channel.wavelength_response()
+correction_table = get_correction_table("jsoc")
+wavelength_response_335 = aia_335_channel.wavelength_response(correction_table=correction_table)
 print(wavelength_response_335)
 
 ###############################################################################
@@ -118,7 +120,9 @@
 # by default in the wavelength response calculation. To exclude this
 # effect,
 
-wavelength_response_335_no_cross = aia_335_channel.wavelength_response(include_crosstalk=False)
+wavelength_response_335_no_cross = aia_335_channel.wavelength_response(
+    include_crosstalk=False, correction_table=correction_table
+)
 
 ###############################################################################
 # If we look at the response around 131 Å (the channel with which 335 Å shares
@@ -145,8 +149,10 @@
 # of 1 January 2019,
 
 obstime = astropy.time.Time("2019-01-01T00:00:00")
-wavelength_response_335_time = aia_335_channel.wavelength_response(obstime=obstime)
-wavelength_response_335_eve = aia_335_channel.wavelength_response(obstime=obstime, include_eve_correction=True)
+wavelength_response_335_time = aia_335_channel.wavelength_response(obstime=obstime, correction_table=correction_table)
+wavelength_response_335_eve = aia_335_channel.wavelength_response(
+    obstime=obstime, include_eve_correction=True, correction_table=correction_table
+)
 
 ###############################################################################
 # We can then compare the two corrected response

examples/skip_correct_degradation.py examples/correct_degradation.pyexamples/skip_correct_degradation.py renamed to examples/correct_degradation.py

@@ -16,6 +16,7 @@
 from sunpy.net import attrs as a
 
 from aiapy.calibrate import degradation
+from aiapy.calibrate.util import get_correction_table
 
 # This lets you pass `astropy.time.Time` objects directly to matplotlib
 time_support(format="jyear")
@@ -51,7 +52,7 @@
 # For more details on how the correction factor is calculated, see the documentation for the
 # `aiapy.calibrate.degradation` function.
 
-correction_factor = degradation(335 * u.angstrom, table["DATE_OBS"])
+correction_factor = degradation(335 * u.angstrom, table["DATE_OBS"], correction_table=get_correction_table("jsoc"))
 table["DATAMEAN_DEG"] = table["DATAMEAN"] / correction_factor
 
 ###############################################################################

examples/prepping_level_1_data.py

@@ -12,10 +12,13 @@
 
 import matplotlib.pyplot as plt
 
+import astropy.units as u
+
 import sunpy.map
 
 import aiapy.data.sample as sample_data
 from aiapy.calibrate import register, update_pointing
+from aiapy.calibrate.util import get_pointing_table
 
 ###############################################################################
 # Performing multi-wavelength analysis on level 1 data can be problematic as
@@ -42,10 +45,12 @@
 ###############################################################################
 # The first step in this process is to update the metadata of the map to the
 # most recent pointing using  the `aiapy.calibrate.update_pointing` function.
-# This function queries the JSOC for the most recent pointing information,
-# updates the metadata, and returns a `sunpy.map.Map` with updated metadata.
+# One needs to get the pointing information from the JSOC using the
+# `aiapy.calibrate.util.get_pointing_table` function.
 
-aia_map_updated_pointing = update_pointing(aia_map)
+# Make range wide enough to get closest 3-hour pointing
+pointing_table = get_pointing_table("JSOC", aia_map.date - 12 * u.h, aia_map.date + 12 * u.h)
+aia_map_updated_pointing = update_pointing(aia_map, pointing_table=pointing_table)
 
 ###############################################################################
 # If we take a look at the plate scale and rotation matrix of the map, we