dkist-processing-cryonirsp 1.8.1__py3-none-any.whl → 1.8.2__py3-none-any.whl

dkist_processing_cryonirsp/tasks/parse.py

@@ -247,33 +247,33 @@ class ParseL0CryonirspSPLinearizedData(ParseL0CryonirspLinearizedData):
             TaskNearFloatBud(
                 constant_name=CryonirspBudName.grating_position_deg.value,
                 metadata_key="grating_position_deg",
-                ip_task_type=TaskName.solar_gain.value,
+                ip_task_types=TaskName.solar_gain.value,
                 task_type_parsing_function=parse_header_ip_task_with_gains,
                 tolerance=0.01,
             ),
             TaskNearFloatBud(
                 constant_name=CryonirspBudName.grating_littrow_angle_deg.value,
                 metadata_key="grating_littrow_angle_deg",
-                ip_task_type=TaskName.solar_gain.value,
+                ip_task_types=TaskName.solar_gain.value,
                 task_type_parsing_function=parse_header_ip_task_with_gains,
                 tolerance=0.01,
             ),
             TaskUniqueBud(
                 constant_name=CryonirspBudName.grating_constant.value,
                 metadata_key="grating_constant",
-                ip_task_type=TaskName.solar_gain.value,
+                ip_task_types=TaskName.solar_gain.value,
                 task_type_parsing_function=parse_header_ip_task_with_gains,
             ),
             TaskUniqueBud(
                 constant_name=CryonirspBudName.wave_min.value,
                 metadata_key="wave_min",
-                ip_task_type=TaskName.solar_gain.value,
+                ip_task_types=TaskName.solar_gain.value,
                 task_type_parsing_function=parse_header_ip_task_with_gains,
             ),
             TaskUniqueBud(
                 constant_name=CryonirspBudName.wave_max.value,
                 metadata_key="wave_max",
-                ip_task_type=TaskName.solar_gain.value,
+                ip_task_types=TaskName.solar_gain.value,
                 task_type_parsing_function=parse_header_ip_task_with_gains,
             ),
             CheckLampGainFramesPickyBud(),

dkist_processing_cryonirsp/tasks/sp_dispersion_axis_correction.py

@@ -10,6 +10,7 @@ from astropy.io import fits
 from astropy.time import Time
 from astropy.wcs import WCS
 from dkist_processing_common.codecs.asdf import asdf_encoder
+from dkist_processing_common.models.dkist_location import location_of_dkist
 from dkist_service_configuration.logging import logger
 from scipy.ndimage import gaussian_filter1d
 from scipy.optimize import differential_evolution
@@ -228,39 +229,12 @@ class SPDispersionAxisCorrection(CryonirspTaskBase):
             solar_atlas_transmission,
         )
 
-    def location_of_dkist(self) -> EarthLocation:
-        """
-        Return hard-coded EarthLocation of the DKIST.
-
-        Cartesian geocentric coordinates of DKIST on Earth as retrieved from https://github.com/astropy/astropy-data/blob/gh-pages/coordinates/sites.json#L755
-        """
-        _dkist_site_info = {
-            "aliases": ["DKIST", "ATST"],
-            "name": "Daniel K. Inouye Solar Telescope",
-            "elevation": 3067,
-            "elevation_unit": "meter",
-            "latitude": 20.7067,
-            "latitude_unit": "degree",
-            "longitude": 203.7436,
-            "longitude_unit": "degree",
-            "timezone": "US/Hawaii",
-            "source": "DKIST website: https://www.nso.edu/telescopes/dki-solar-telescope/",
-        }
-        location_of_dkist = EarthLocation.from_geodetic(
-            _dkist_site_info["longitude"] * u.Unit(_dkist_site_info["longitude_unit"]),
-            _dkist_site_info["latitude"] * u.Unit(_dkist_site_info["latitude_unit"]),
-            _dkist_site_info["elevation"] * u.Unit(_dkist_site_info["elevation_unit"]),
-        )
-        return location_of_dkist
-
     def get_doppler_shift(self) -> u.Quantity:
         """Find the speed at which DKIST is moving relative to the Sun's center.
 
         Positive values refer to when DKIST is moving away from the sun.
         """
-        coord = self.location_of_dkist().get_gcrs(
-            obstime=Time(self.constants.solar_gain_ip_start_time)
-        )
+        coord = location_of_dkist.get_gcrs(obstime=Time(self.constants.solar_gain_ip_start_time))
         heliocentric_coord = coord.transform_to(
             HeliocentricInertial(obstime=Time(self.constants.solar_gain_ip_start_time))
         )

dkist_processing_cryonirsp/tasks/write_l1.py

@@ -12,6 +12,7 @@ from astropy.coordinates.sky_coordinate import SkyCoord
 from astropy.io import fits
 from astropy.time.core import Time
 from dkist_processing_common.codecs.asdf import asdf_decoder
+from dkist_processing_common.models.dkist_location import location_of_dkist
 from dkist_processing_common.models.wavelength import WavelengthRange
 from dkist_processing_common.tasks import WriteL1Frame
 from sunpy.coordinates import GeocentricEarthEquatorial
@@ -281,11 +282,11 @@ class CryonirspWriteL1Frame(WriteL1Frame, ABC):
             boresight_coordinates[0] * u.arcsec,
             boresight_coordinates[1] * u.arcsec,
             obstime=t0,
-            observer=self.location_of_dkist.get_itrs(t0),
+            observer=location_of_dkist.get_itrs(t0),
             frame="helioprojective",
         )
 
-        frame_altaz = AltAz(obstime=t0, location=self.location_of_dkist)
+        frame_altaz = AltAz(obstime=t0, location=location_of_dkist)
 
         # Find angle between zenith and solar north at the center boresight pointing
         solar_orientation_angle = self.get_solar_orientation_angle(
@@ -347,7 +348,7 @@ class CryonirspWriteL1Frame(WriteL1Frame, ABC):
             boresight_coordinates[0] * u.arcsec,
             (boresight_coordinates[1] + 1) * u.arcsec,
             obstime=t0,
-            observer=self.location_of_dkist.get_itrs(t0),
+            observer=location_of_dkist.get_itrs(t0),
             frame="helioprojective",
         )
 
@@ -695,7 +696,7 @@ class CIWriteL1Frame(CryonirspWriteL1Frame):
             observed_pix_x_rotated * u.arcsec,
             observed_pix_y_rotated * u.arcsec,
             obstime=t0,
-            observer=self.location_of_dkist.get_itrs(t0),
+            observer=location_of_dkist.get_itrs(t0),
             frame="helioprojective",
         )
 
@@ -709,7 +710,7 @@ class CIWriteL1Frame(CryonirspWriteL1Frame):
             x * u.arcsec,
             y * u.arcsec,
             obstime=t0,
-            observer=self.location_of_dkist.get_itrs(t0),
+            observer=location_of_dkist.get_itrs(t0),
             frame="helioprojective",
         )
         with Helioprojective.assume_spherical_screen(sky_coord.observer):
@@ -967,7 +968,7 @@ class SPWriteL1Frame(CryonirspWriteL1Frame):
             observed_pix_x_rotated * u.arcsec,
             observed_pix_y_rotated * u.arcsec,
             obstime=t0,
-            observer=self.location_of_dkist.get_itrs(t0),
+            observer=location_of_dkist.get_itrs(t0),
             frame="helioprojective",
         )
         with Helioprojective.assume_spherical_screen(sky_coord.observer):
@@ -980,7 +981,7 @@ class SPWriteL1Frame(CryonirspWriteL1Frame):
             x * u.arcsec,
             y * u.arcsec,
             obstime=t0,
-            observer=self.location_of_dkist.get_itrs(t0),
+            observer=location_of_dkist.get_itrs(t0),
             frame="helioprojective",
         )
         with Helioprojective.assume_spherical_screen(sky_coord.observer):

{dkist_processing_cryonirsp-1.8.1.dist-info → dkist_processing_cryonirsp-1.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-cryonirsp
-Version: 1.8.1
+Version: 1.8.2
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -17,7 +17,7 @@ Requires-Dist: Pillow==10.4.0
 Requires-Dist: astropy==7.0.2
 Requires-Dist: dkist-fits-specifications==4.17.0
 Requires-Dist: dkist-header-validator==5.2.1
-Requires-Dist: dkist-processing-common==10.9.0
+Requires-Dist: dkist-processing-common==11.0.0
 Requires-Dist: dkist-processing-math==2.2.0
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-spectral-lines==3.0.0
@@ -48,7 +48,7 @@ Provides-Extra: asdf
 Requires-Dist: dkist-processing-common[asdf]; extra == "asdf"
 Requires-Dist: dkist-inventory[asdf]==1.8.4; extra == "asdf"
 Provides-Extra: quality
-Requires-Dist: dkist-quality==1.2.1; extra == "quality"
+Requires-Dist: dkist-quality==1.3.0; extra == "quality"
 Provides-Extra: grogu
 Requires-Dist: dkist; extra == "grogu"
 Requires-Dist: pyparsing; extra == "grogu"
@@ -86,7 +86,7 @@ Requires-Dist: SQLAlchemy-JSONField==1.0.2; extra == "frozen"
 Requires-Dist: SQLAlchemy-Utils==0.41.2; extra == "frozen"
 Requires-Dist: WTForms==3.2.1; extra == "frozen"
 Requires-Dist: Werkzeug==2.2.3; extra == "frozen"
-Requires-Dist: aioftp==0.26.1; extra == "frozen"
+Requires-Dist: aioftp==0.26.2; extra == "frozen"
 Requires-Dist: aiohappyeyeballs==2.6.1; extra == "frozen"
 Requires-Dist: aiohttp==3.12.13; extra == "frozen"
 Requires-Dist: aiosignal==1.3.2; extra == "frozen"
@@ -114,14 +114,14 @@ Requires-Dist: asdf_transform_schemas==0.6.0; extra == "frozen"
 Requires-Dist: asgiref==3.8.1; extra == "frozen"
 Requires-Dist: asteval==1.0.6; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2025.6.23.0.39.50; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2025.6.30.0.39.40; extra == "frozen"
 Requires-Dist: asyncpg==0.30.0; extra == "frozen"
 Requires-Dist: attrs==25.3.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.1; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.38.44; extra == "frozen"
-Requires-Dist: botocore==1.38.44; extra == "frozen"
+Requires-Dist: boto3==1.39.2; extra == "frozen"
+Requires-Dist: botocore==1.39.2; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.5.3; extra == "frozen"
 Requires-Dist: certifi==2025.6.15; extra == "frozen"
@@ -138,15 +138,15 @@ Requires-Dist: connexion==2.14.2; extra == "frozen"
 Requires-Dist: contourpy==1.3.2; extra == "frozen"
 Requires-Dist: cron-descriptor==1.4.5; extra == "frozen"
 Requires-Dist: croniter==6.0.0; extra == "frozen"
-Requires-Dist: cryptography==45.0.4; extra == "frozen"
+Requires-Dist: cryptography==45.0.5; extra == "frozen"
 Requires-Dist: cycler==0.12.1; extra == "frozen"
 Requires-Dist: dacite==1.9.2; extra == "frozen"
 Requires-Dist: decorator==5.2.1; extra == "frozen"
 Requires-Dist: dill==0.4.0; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
-Requires-Dist: dkist-processing-common==10.9.0; extra == "frozen"
+Requires-Dist: dkist-processing-common==11.0.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==5.1.1; extra == "frozen"
-Requires-Dist: dkist-processing-cryonirsp==1.8.1; extra == "frozen"
+Requires-Dist: dkist-processing-cryonirsp==1.8.2; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.0; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==2.2; extra == "frozen"
@@ -161,11 +161,12 @@ Requires-Dist: flower==2.0.1; extra == "frozen"
 Requires-Dist: fonttools==4.58.4; extra == "frozen"
 Requires-Dist: frozenlist==1.7.0; extra == "frozen"
 Requires-Dist: fsspec==2025.5.1; extra == "frozen"
-Requires-Dist: globus-sdk==3.58.0; extra == "frozen"
+Requires-Dist: globus-sdk==3.59.0; extra == "frozen"
 Requires-Dist: google-re2==1.1.20240702; extra == "frozen"
 Requires-Dist: googleapis-common-protos==1.70.0; extra == "frozen"
 Requires-Dist: gqlclient==1.2.3; extra == "frozen"
-Requires-Dist: grpcio==1.73.0; extra == "frozen"
+Requires-Dist: greenlet==3.2.3; extra == "frozen"
+Requires-Dist: grpcio==1.73.1; extra == "frozen"
 Requires-Dist: gunicorn==23.0.0; extra == "frozen"
 Requires-Dist: h11==0.16.0; extra == "frozen"
 Requires-Dist: httpcore==1.0.9; extra == "frozen"
@@ -202,7 +203,7 @@ Requires-Dist: mdurl==0.1.2; extra == "frozen"
 Requires-Dist: methodtools==0.4.7; extra == "frozen"
 Requires-Dist: more-itertools==10.7.0; extra == "frozen"
 Requires-Dist: moviepy==2.1.2; extra == "frozen"
-Requires-Dist: multidict==6.5.1; extra == "frozen"
+Requires-Dist: multidict==6.6.3; extra == "frozen"
 Requires-Dist: nbformat==5.10.4; extra == "frozen"
 Requires-Dist: networkx==3.5; extra == "frozen"
 Requires-Dist: numba==0.61.2; extra == "frozen"
@@ -227,6 +228,7 @@ Requires-Dist: pillow==10.4.0; extra == "frozen"
 Requires-Dist: pip==25.1.1; extra == "frozen"
 Requires-Dist: platformdirs==4.3.8; extra == "frozen"
 Requires-Dist: pluggy==1.6.0; extra == "frozen"
+Requires-Dist: pooch==1.8.2; extra == "frozen"
 Requires-Dist: prison==0.2.1; extra == "frozen"
 Requires-Dist: proglog==0.1.12; extra == "frozen"
 Requires-Dist: prometheus_client==0.22.1; extra == "frozen"
@@ -256,15 +258,16 @@ Requires-Dist: retry==0.9.2; extra == "frozen"
 Requires-Dist: rfc3339-validator==0.1.4; extra == "frozen"
 Requires-Dist: rich==13.9.4; extra == "frozen"
 Requires-Dist: rich-argparse==1.7.1; extra == "frozen"
-Requires-Dist: rpds-py==0.25.1; extra == "frozen"
+Requires-Dist: rpds-py==0.26.0; extra == "frozen"
 Requires-Dist: s3transfer==0.13.0; extra == "frozen"
 Requires-Dist: scikit-image==0.25.2; extra == "frozen"
 Requires-Dist: scipy==1.15.3; extra == "frozen"
 Requires-Dist: semantic-version==2.10.0; extra == "frozen"
 Requires-Dist: setproctitle==1.3.6; extra == "frozen"
-Requires-Dist: setuptools==75.6.0; extra == "frozen"
+Requires-Dist: setuptools==65.5.0; extra == "frozen"
 Requires-Dist: six==1.17.0; extra == "frozen"
 Requires-Dist: sniffio==1.3.1; extra == "frozen"
+Requires-Dist: solar-wavelength-calibration==1.0; extra == "frozen"
 Requires-Dist: sqids==0.5.1; extra == "frozen"
 Requires-Dist: sqlparse==0.5.3; extra == "frozen"
 Requires-Dist: sunpy==6.1.1; extra == "frozen"

{dkist_processing_cryonirsp-1.8.1.dist-info → dkist_processing_cryonirsp-1.8.2.dist-info}/RECORD

@@ -36,15 +36,15 @@ dkist_processing_cryonirsp/tasks/instrument_polarization.py,sha256=xS2jcngnibDCL
 dkist_processing_cryonirsp/tasks/l1_output_data.py,sha256=3RFt493MEJxdpF81gcp8FDlQ8vGZ0GXEDYQFWIufumI,1554
 dkist_processing_cryonirsp/tasks/linearity_correction.py,sha256=n9vK9cT7NWkpAM9J6wOYDj95Kh0va_ot-hdncd7ye0Y,24199
 dkist_processing_cryonirsp/tasks/make_movie_frames.py,sha256=I7s3Tml6AevHci0kTPF71mNjXNl3wlG57Jh7ghnndeg,13928
-dkist_processing_cryonirsp/tasks/parse.py,sha256=PRpXQ0KdY-kSSTJ5Q4z6NWku9HiuEwZ1wqXutBoB1Fk,13109
+dkist_processing_cryonirsp/tasks/parse.py,sha256=5nkCjKeCi6oKHzBXmqs81yZwyRPBmIMmL8Lh53CEv4E,13114
 dkist_processing_cryonirsp/tasks/quality_metrics.py,sha256=jyx2YZzLb5sVxbJ_H6PaKQqZbyZy9QuuLqu18jsnncQ,11447
 dkist_processing_cryonirsp/tasks/science_base.py,sha256=YYUQUfLeuzDb6E5TecOH22orTN4-hWocoYaGOq6Zoro,18637
 dkist_processing_cryonirsp/tasks/sp_beam_boundaries.py,sha256=XI3iepNe04xaU4ilqxrlOgYDkv5I5rUc0RXEE1Rwt0o,10296
-dkist_processing_cryonirsp/tasks/sp_dispersion_axis_correction.py,sha256=EaUanXd_uvuTxGuWEfFMFRls7S0GPu_P35H3LKqfrj0,19366
+dkist_processing_cryonirsp/tasks/sp_dispersion_axis_correction.py,sha256=w3DHEWEJwl3zuKuUB6kzG3vuBWJM84cZGbfeFQKWwJE,18279
 dkist_processing_cryonirsp/tasks/sp_geometric.py,sha256=_M_e_blz4mKDIUWSasonnOzbZ6EUbHp9pAZXQx4zY7U,24387
 dkist_processing_cryonirsp/tasks/sp_science.py,sha256=QWyAEkXYamAcWxi62-tVD6ptuQ6vt8yIzuCKzCIYW20,13643
 dkist_processing_cryonirsp/tasks/sp_solar_gain.py,sha256=d4UABsMxyzCMduVxptHY_TCGqS-l-W5iuhW7HJwVPkA,21024
-dkist_processing_cryonirsp/tasks/write_l1.py,sha256=ebZCWr5i6LUXJ38oXSq22zRKNP7sdBuxbJAEV5oJM84,41435
+dkist_processing_cryonirsp/tasks/write_l1.py,sha256=nLAV0fx_bRFA7WAPrdxJQKogGSRj3pscDJXzhogrVuw,41476
 dkist_processing_cryonirsp/tasks/mixin/__init__.py,sha256=m6UekKftTahNJ3W5K3mZSz4Y4ZZpHRxF_ZAxuaKYL7o,12
 dkist_processing_cryonirsp/tasks/mixin/corrections.py,sha256=rcKmckBJkoExcX0XW1i3OZzuMu1i7tX5Hgwy15chU50,6566
 dkist_processing_cryonirsp/tasks/mixin/shift_measurements.py,sha256=EbU3VQ_1QLbENHO_SfhWc7d573UwbofKU-PpbfBPKI8,11620
@@ -105,7 +105,7 @@ docs/requirements_table.rst,sha256=FaqSag9kPi77gWPhzeo_tFEhRFjb3qUuNqqQe1K76NM,2
 docs/scientific_changelog.rst,sha256=01AWBSHg8zElnodCgAq-hMxhk9CkX5rtEENx4iz0sjI,300
 docs/sp_science_calibration.rst,sha256=XL-H_hyzqwPHYNW3j-muItX_hGqMi-gjFRQbHp60LlU,2997
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_cryonirsp-1.8.1.dist-info/METADATA,sha256=e2MqEKO96OvSkYnli-X4hjhij5dvNr7AOJ79UAsrmE8,21941
-dkist_processing_cryonirsp-1.8.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dkist_processing_cryonirsp-1.8.1.dist-info/top_level.txt,sha256=Sm9b1ddKnsF9Bh3mqDOct1Sm7k8I9aN7vGHgpmu-MlQ,51
-dkist_processing_cryonirsp-1.8.1.dist-info/RECORD,,
+dkist_processing_cryonirsp-1.8.2.dist-info/METADATA,sha256=QuZlgzMvdABYGiw2De7htL2f4twfWpTafx3xLvKE5OY,22104
+dkist_processing_cryonirsp-1.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dkist_processing_cryonirsp-1.8.2.dist-info/top_level.txt,sha256=Sm9b1ddKnsF9Bh3mqDOct1Sm7k8I9aN7vGHgpmu-MlQ,51
+dkist_processing_cryonirsp-1.8.2.dist-info/RECORD,,