Revert "Merge remote-tracking branch 'origin/enh/checkProcessedArc' into enh/auto_wavecal_help"

This reverts commit 00ed143, reversing
changes made to 465eb5b.

Author: chris-simpson

README.md

@@ -40,7 +40,7 @@ $ conda config --add channels http://astroconda.gemini.edu/public
 ```
 
 
-A list of changes since 4.1 can be found in the [Change Logs](https://dragons.readthedocs.io/en/v4.2.1/changes.html).
+A list of changes since 4.1 can be found in the [Change Logs](https://dragons.readthedocs.io/en/v4.2.0/changes.html).
 
 ---
 # What is DRAGONS

astrodata/_version.py

@@ -5,10 +5,10 @@
 """
 
 # --- Setup Version Here ---
-API = 5
-FEATURE = 0
-BUG = 0
-TAG = 'dev'
+API = 4
+FEATURE = 2
+BUG = 1
+TAG = ''
 
 
 def version(short=False, tag=TAG):

astrodata/doc/conf.py

@@ -57,13 +57,13 @@
 # built documents.
 #
 # The short X.Y version.
-version = '5.0_dev'
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-#release = '4.2.1'
-#rtdurl = 'v'+release
+release = '4.2.1'
+rtdurl = 'v'+release
 #release = '4.2.x'
 #rtdurl = 'release-'+release
-rtdurl = 'latest'
+#rtdurl = 'latest'
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation

doc/DRAGONS/conf.py

@@ -59,13 +59,13 @@
 # built documents.
 #
 # The short X.Y version.
-version = '5.0_dev'
+version = '4.2'
 # The full version, including alpha/beta/rc tags.
-#release = '4.2.1'
-#rtdurl = 'v'+release
+release = '4.2.1'
+rtdurl = 'v'+release
 #release = '4.2.x'
 #rtdurl = 'release-'+release
-rtdurl = 'latest'
+#rtdurl = 'latest'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/DRAGONS/dragonsteam.rst

@@ -18,6 +18,7 @@ Current DRAGONS Team
 
 * Paul Hirst
 * Kathleen Labrie
+* Mark Rawlings
 * Chris Simpson
 * Olesja Smirnova
 * Monika Soraisam
@@ -35,7 +36,6 @@ Past DRAGONS Team Members
 * Simon Conseil
 * Oliver Oberdorf
 * Bruno Quint
-* Mark Rawlings
 * D.J. Teal
 * Joanna Thomas-Osip
 

geminidr/core/parameters_calibdb.py

@@ -60,6 +60,7 @@ class getProcessedTelluricConfig(config.Config):
 class getProcessedTelluricConfig(config.Config):
     pass
 
+
 class getBPMConfig(config.Config):
     pass
 
@@ -135,5 +136,6 @@ class storeProcessedStandardConfig(config.Config):
 class storeProcessedSlitIllumConfig(config.Config):
     suffix = config.Field("Filename suffix", str, "_slitIllum", optional=True)
 
+
 class storeProcessedTelluricConfig(config.Config):
     suffix = config.Field("Filename suffix", str, "_telluric", optional=True)

geminidr/core/parameters_spect.py

@@ -579,8 +579,6 @@ class maskBeyondSlitConfig(config.Config):
         "Minimum fraction of pixel that must be illuminated to not be masked",
         float, 0.9, min=0., max=1., inclusiveMax=True)
 
-class monitorWavelengthSolutionConfig(config.Config):
-    suffix = config.Field("Filename suffix", str, "_wavelengthSolutionMonitoring", optional=True)
 
 class normalizeFlatConfig(config.core_1Dfitting_config):
     suffix = config.Field("Filename suffix", str, "_normalized", optional=True)

geminidr/core/primitives_spect.py

@@ -16,7 +16,6 @@
 from importlib import import_module
 
 import matplotlib
-import numpy
 import numpy as np
 from astropy import units as u
 from astropy.io.ascii.core import InconsistentTableError
@@ -4014,63 +4013,6 @@ def maskBeyondSlit(self, adinputs=None, **params):
 
         return adinputs
 
-    def monitorWavelengthSolution(self, adinputs=None, **params):
-        """
-        This captures some info from the wavelength solution for the GOA
-        instrument monitoring system into various MWS_ headers for the instrument
-        monitoring system to pick up.
-
-        Values Captured include the polynomial coefficients and RMS from the
-        .WAVECAL table, the central wavelength from both the WCS and central_wavlength()
-        descriptor and the difference between them.
-        :return:
-        """
-        log = self.log
-        log.debug(gt.log_message("primitive", self.myself(), "starting"))
-
-        tocapture = ('c0', 'c1', 'c2', 'c3', 'rms', 'inv_rms', 'fwidth')
-
-        for ad in adinputs:
-            for ext in ad:
-                wavecal = getattr(ext, 'WAVECAL', None)
-                if wavecal is None:
-                    continue
-
-                for row in wavecal:
-                    # Capture values from WAVEVAL table into monitoring headers
-                    if row['name'] in tocapture:
-                        keyword = 'MWS_' + row['name'].upper()[:4]
-                        if row['name'] == 'inv_rms':
-                            keyword = 'MWS_IRMS'
-                        ext.hdr[keyword] = (row['coefficients'],
-                                            f'WAVECAL {row['name']} coefficient')
-
-                # Get the model and evaluate it at the mean of its domain
-                model = am.get_named_submodel(ext.wcs.forward_transform, "WAVE")
-                if model:
-                    # Central Wavelength check
-                    center = np.mean(model.domain)
-                    model_central_wlen = model(center)
-                    # We want actual_central_wavelength rather than central_wavelength
-                    header_central_wlen = ext.actual_central_wavelength(asNanometers=True)
-
-                    ext.hdr['MWS_DCWL'] = (model_central_wlen - header_central_wlen,
-                                           'Delta between model and header central_wavelength')
-
-                    # Dispersion check
-                    model_dispersion = model(center+0.5) - model(center-0.5)
-                    header_dispersion = ext.dispersion(asNanometers=True)
-                    ext.hdr['MWS_DDIS'] = (model_dispersion - header_dispersion,
-                                           'Delta between model and header dispersion')
-
-
-                # Count the number of arc lines in the wavecal table
-                ext.hdr['MWS_NUML'] = (numpy.count_nonzero(wavecal['peaks']),
-                                       'Number of non-zero peaks in the WAVECAL table')
-
-            ad.update_filename(suffix=params["suffix"], strip=True)
-
-        return adinputs
 
     def normalizeFlat(self, adinputs=None, **params):
         """

geminidr/doc/tutorials/F2Img-DRTutorial/conf.py

@@ -36,15 +36,15 @@
 
 # The short X.Y version
 #version = astrodata.version(short=True)
-version = '5.0_dev'
+version = '4.2'
 
 # The full version, including alpha/beta/rc tags
 #release = astrodata.version()
-#release = '4.2.1'
-#rtdurl = 'v'+release
+release = '4.2.1'
+rtdurl = 'v'+release
 #release = '4.2.x'
 #rtdurl = 'release-'+release
-rtdurl = 'latest'
+#rtdurl = 'latest'
 
 # -- General configuration ---------------------------------------------------
 

geminidr/doc/tutorials/F2LS-DRTutorial/conf.py

@@ -11,14 +11,14 @@
 author = 'DRAGONS Team'
 
 # The short X.Y version
-version = '5.0_dev'
+version = '4.2'
 
 # The full version, including alpha/beta/rc tags
-#release = '4.2.1'
-#rtdurl = 'v'+release
+release = '4.2.1'
+rtdurl = 'v'+release
 #release = '4.2.x'
 #rtdurl = 'release-'+release
-rtdurl = 'latest'
+#rtdurl = 'latest'
 
 today = 'April 2026'