Merge branch 'release/4.x' into bugfix/wavecal_snr

Author: chris-simpson

gemini_instruments/gnirs/lookup.py

@@ -191,19 +191,14 @@
     # Dispersion values are in nm/pix (updated by CJS 20250109)
     # The dispersion values are based on wvl. coverages for each filter/mode listed in GNIRS instrument pages.
     ("10/mm", "Short")  : {"M": -1.939},
-    ("10/mm", "Long")   : {"X": -0.324,  "J": -0.389,   "H": -0.485, "K": -0.647, "L": -0.972, "M": -1.943},
-    ("32/mm", "Short")  : {"X": -0.323,  "J": -0.388,   "H": -0.484, "K": -0.646, "L": -0.969, "M": -1.934},
-    ("32/mm", "Long")   : {"X": -0.107,  "J": -0.129,   "H": -0.162, "K": -0.216, "L": -0.324, "M": -0.645},
-    ("111/mm", "Short") : {"X": -0.092,  "J": -0.110,   "H": -0.139, "K": -0.185, "L": -0.273, "M": -0.562},
-    ("111/mm", "Long")  : {"X": -0.0309, "J": -0.0371,  "H": -0.0464,"K": -0.0618,"L": -0.0922,"M": -0.1875}
+    ("10/mm", "Long")   : {"I": -0.244, "Z": -0.273, "X": -0.324,  "J": -0.389,   "H": -0.485, "K": -0.647, "L": -0.972, "M": -1.943},
+    ("32/mm", "Short")  : {"I": -0.244, "Z": -0.273, "X": -0.323,  "J": -0.388,   "H": -0.484, "K": -0.646, "L": -0.969, "M": -1.934},
+    ("32/mm", "Long")   : {             "Z": -0.090, "X": -0.107,  "J": -0.129,   "H": -0.162, "K": -0.216, "L": -0.324, "M": -0.645}, # I is a guesses, the order is only partially visible
+    ("111/mm", "Short") : {"I": -0.069, "Z": -0.079, "X": -0.092,  "J": -0.110,   "H": -0.139, "K": -0.185, "L": -0.273, "M": -0.562}, # all values ok
+    ("111/mm", "Long")  : {"I": -0.023, "Z": -0.027, "X": -0.0309, "J": -0.0371,  "H": -0.0464,"K": -0.0618,"L": -0.0922,"M": -0.1875}
 }
 
 # XD order number mapping to filter names
 xd_orders = {
-    1: "L",
-    2: "M",
-    3: "K",
-    4: "H",
-    5: "J",
-    6: "X"
+    1: "L", 2: "M", 3: "K", 4: "H", 5: "J", 6: "X", 7: "Z", 8: "I"
 }

geminidr/gemini/primitives_qa.py

@@ -1248,7 +1248,7 @@ def report(self, results, header=None):
             body.append(('(Requested IQ could not be determined)', ''))
 
         # allow comparison if "elip" is None
-        if results.get("elip") or 0 > 0.1:
+        if result.get("elip") != None and results.get("elip", 0) > 0.1:
             body.append(('', 'WARNING: high ellipticity'))
             self.comments.append('High ellipticity')
             if 'NON_SIDEREAL' in self.ad_tags:

geminidr/gnirs/lookups/MDF_XD.py

@@ -11,7 +11,7 @@
 # definitions based on a key generated from the 'telescope', '_prism', 'decker',
 # '_grating', and 'camera' attributes of a file.
 
-def get_slit_info(key, central_wavelength=None):
+def get_slit_info(key, central_wavelength=None, grating_order=None):
     """
     Returns the slit information for GNIRS cross-dispersed data.
 
@@ -21,13 +21,92 @@ def get_slit_info(key, central_wavelength=None):
         A tuple containing slit information: x_ccd, y_ccd, and width_pixels.
     """
     if callable(slit_info[key]):
-        info = slit_info[key](central_wavelength)
+        info = slit_info[key](central_wavelength, grating_order)
     else:
         info = slit_info[key]
 
     return info
 
-def _gem_north_lxd_lcxd_111_longblue(central_wavelength):
+def _dynamic_x_ccd(solutions, central_wavelength, grating_order):
+    """
+    Returns x position information for GNIRS XD orders, given a central
+    wavelength and grating order.  The specific dynamic solution for the
+    configuration needs to be provided.
+
+
+    Parameters
+    ----------
+    solutions: dict
+        1 degree polynomial solution for each order.  Eg:
+        solutions = {
+            # order: (slope, constant)  1 degree polynomial
+            'order3': (-203.125, 806.54),
+            'order4': (-156.250, 814.42),
+            'order5': (-162.500, 905.83),
+            'order6': (-196.875, 1053.79),
+            'order7': (-250.000, 1245.67),
+            'order8': (-318.750, 1480.58),
+        }
+    central_wavelength : float
+        The central wavelength in nm to determine the slit positions.  As
+        returned by the descriptor, default units (nm).
+    grating_order: int
+        The grating order for which the central wavelength is provided.
+    Returns
+    -------
+    list
+        A list containing x_ccd.
+    """
+
+    if central_wavelength is None:
+        raise ValueError("central_wavelength must be provided for this configuration.")
+    central_wavelength *= 1.e6  # Convert from meters to um (descriptor default)
+    # Calculate central_wavelength for order 3:
+    central_wavelength_ord3 = central_wavelength * grating_order / 3.0
+
+    x_ccd = []
+    for solution in solutions:
+        slope, constant = solutions[solution]
+        x_ccd.append(slope * central_wavelength_ord3 + constant)
+
+    return x_ccd
+
+
+def _gem_north_sxd_scxd_111_shortblue_5538(central_wavelength, grating_order):
+    """
+    Returns slit information for the Gemini North ShortBlue camera, 111 l/mm grating,
+    SXD configuration.
+
+    Parameters
+    ----------
+    central_wavelength : float
+        The central wavelength in nm to determine the slit positions.
+    grating_order: int
+        The grating order for which the central wavelength is provided.
+    Returns
+    -------
+    tuple
+        A tuple containing x_ccd, y_ccd, and width_pixels.
+    """
+
+    solutions = {
+        # order: (slope, constant)  1 degree polynomial
+        'order3': (-203.125, 806.54),
+        'order4': (-156.250, 814.42),
+        'order5': (-162.500, 905.83),
+        'order6': (-196.875, 1053.79),
+        'order7': (-250.000, 1245.67),
+        'order8': (-318.750, 1480.58),
+    }
+
+    x_ccd = tuple(_dynamic_x_ccd(solutions, central_wavelength, grating_order))
+    y_ccd = 512
+    width_pixels = 47
+
+    return (x_ccd, y_ccd, width_pixels)
+
+
+def _gem_north_lxd_lcxd_111_longblue(central_wavelength, grating_order):
     """
     Returns slit information for the Gemini North Long camera, 111 l/mm grating,
     LXD configuration.
@@ -36,17 +115,14 @@ def _gem_north_lxd_lcxd_111_longblue(central_wavelength):
     ----------
     central_wavelength : float
         The central wavelength in nm to determine the slit positions.
-
+    grating_order: int
+        The grating order for which the central wavelength is provided.
     Returns
     -------
     tuple
         A tuple containing x_ccd, y_ccd, and width_pixels.
     """
-    if central_wavelength is None:
-        raise ValueError("central_wavelength must be provided for this configuration.")
-    central_wavelength *= 1.e6  # Convert from meters to um (descriptor default)
 
-    # x position calculation based on central wavelength
     solutions = {
         # order: (slope, constant)  1 degree polynomial
         'order3': (-387.148, 1021.51),
@@ -57,12 +133,8 @@ def _gem_north_lxd_lcxd_111_longblue(central_wavelength):
         # order 8 is hardly visible in the flats. Also can fall off the
         # detector at some wavelength settings.
     }
-    x_ccd = []
-    for solution in solutions:
-        slope, constant = solutions[solution]
-        x_ccd.append(slope * central_wavelength + constant)
 
-    x_ccd = tuple(x_ccd)
+    x_ccd = tuple(_dynamic_x_ccd(solutions, central_wavelength, grating_order))
     y_ccd = 512
     width_pixels = 100
 
@@ -93,6 +165,15 @@ def _gem_north_lxd_lcxd_111_longblue(central_wavelength):
     175,     # y_ccd
     47            # width_pixels
     ),
+# North, Short, 111 l/mm, SXD
+'Gemini-North_SXD_G5536_SCXD_G5531_111/mm_G5534_ShortBlue_G5538':
+    _gem_north_sxd_scxd_111_shortblue_5538,
+
+# 'Gemini-North_SXD_G5536_SCXD_G5531_111/mm_G5534_ShortBlue_G5538': (
+#     (275, 389, 466, 534, 607, 685),     # x_ccd
+#     175,     # y_ccd
+#     47            # width_pixels
+#     ),
 # North, Short, 111 l/mm, LXD
 # --------------------------------- Long camera -------------------------------
 # North, Long, 10 l/mm, SXD

geminidr/gnirs/lookups/argon.dat

@@ -49,6 +49,7 @@
 8622.8379	#	NOAO
 8637.0195	#	NOAO
 8656.7598	#	NOAO
+8668.0000   #   from GNIRS XD Ar lamp calibration image
 8670.3242	#	NOAO
 8764.1260	#	NOAO
 8783.0342	#	NOAO

geminidr/gnirs/lookups/orders_XD.py

@@ -27,6 +27,10 @@
     (2210, 1660, 1330, 1110, 950, 830),                         # nm
     (-0.1853, -0.13882, -0.11117, -0.09242, -0.08, -0.0694),    # nm/pixel
     ),
+'Gemini-North_SXD_G5536_SCXD_G5531_111/mm_G5534_ShortBlue_G5538': (
+    (2210, 1660, 1330, 1110, 950, 830),                         # nm
+    (-0.1853, -0.13882, -0.11117, -0.09242, -0.08, -0.0694),    # nm/pixel
+    ),
 # North, Short, 111 l/mm, LXD
 # --------------------------------- Long camera -------------------------------
 # North, Long, 10 l/mm, SXD
@@ -46,8 +50,9 @@
     ),
 # North, Long, 32 l/mm, LXD
 'Gemini-North_LXD_G5535_LCXD_G5531_32/mm_G5533_LongBlue_G5542': (
-    (2210, 1660, 1330, 1110),
-    (-0.1853, -0.13882, -0.11117, -0.09242),
+    (2210, 1660, 1330, 1110, 950),
+    #(-0.1853, -0.13882, -0.11117, -0.09242, -0.07), # bad values from IRAF
+    (-0.2155, -0.1616, -0.1294, -0.1078, -0.09),
     ),
 # North, Long, 111 l/mm, SXD
 # North, Long, 111 l/mm, LXD

geminidr/gnirs/primitives_gnirs_crossdispersed.py

@@ -55,7 +55,7 @@ def addMDF(self, adinputs=None, suffix=None):
                              '_grating', 'camera')
             mdf_key = "_".join(getattr(ad, desc)()
                                for desc in mdf_key_parts)
-            x_ccd, y_ccd, length_pix = get_slit_info(mdf_key, ad.central_wavelength())
+            x_ccd, y_ccd, length_pix = get_slit_info(mdf_key, ad.central_wavelength(), ad._grating_order())
             mdf_table = Table([range(1, len(x_ccd) + 1), x_ccd], names=['slit_id', 'x_ccd'])
             mdf_table['y_ccd'] = y_ccd
             mdf_table['specorder'] = mdf_table['slit_id'] + 2

geminidr/gnirs/tests/crossdispersed/__init__.py

@@ -2,3 +2,4 @@
 """
 Tests for GNIRS XD Primitives.
 """
+CREATED_INPUTS_PATH_FOR_TESTS = "./geminidr/gnirs/crossdispersed/"