make distortionCorrect() handle existing rectification model properly

Author: chris-simpson

geminidr/core/primitives_spect.py

@@ -1537,7 +1537,14 @@ def determineDistortion(self, adinputs=None, **params):
                 else:
                     has_rect_model = True
                     in_coords = rect_model(*in_coords)
-                    ref_coords = rect_model(*ref_coords)
+                    # For a vertically-dispersed spectrum, the rectification
+                    # model alters X as a function of Y. Therefore, because
+                    # incoords and ref_coords have different Y for the same X,
+                    # putting them *both* through the rectification model will
+                    # produce different X values, which is not what we want.
+                    # S0 replace the X values in ref_coords with the ones in
+                    # in_coords. Coords are *always* (x, y)
+                    ref_coords[dispaxis] = in_coords[dispaxis]
 
                 # The model is computed entirely in the pixel coordinate frame
                 # of the data, so it could be used as a gWCS object

geminidr/f2/tests/longslit/test_determine_distortion.py

@@ -216,10 +216,10 @@ def test_regression_for_determine_distortion_using_wcs(
     ref_ad = ref_ad_factory(distortion_determined_ad.filename)
 
     # Confirm that the distortion model is placed after the rectification model
-    assert (distortion_determined_ad.wcs.avilable_frames.index("distortion_corrected") >
-            distortion_determined_ad.wcs.avilable_frames.index("rectified"))
-    assert (ref_ad.wcs.avilable_frames.index("distortion_corrected") >
-            ref_ad.wcs.avilable_frames.index("rectified"))
+    assert (distortion_determined_ad[0].wcs.available_frames.index("distortion_corrected") >
+            distortion_determined_ad[0].wcs.available_frames.index("rectified"))
+    assert (ref_ad[0].wcs.available_frames.index("distortion_corrected") >
+            ref_ad[0].wcs.available_frames.index("rectified"))
 
     model = distortion_determined_ad[0].wcs.get_transform("pixels", "distortion_corrected")
     ref_model = ref_ad[0].wcs.get_transform("pixels", "distortion_corrected")

geminidr/gnirs/tests/crossdispersed/test_determine_distortion.py

@@ -62,10 +62,10 @@ def test_regression_for_determine_distortion_using_wcs(
     ref_ad = ref_ad_factory(distortion_determined_ad.filename)
     for ext, ref_ext in zip(distortion_determined_ad, ref_ad):
         # Confirm that the distortion model is placed after the rectification model
-        assert (ext.wcs.avilable_frames.index("distortion_corrected") >
-                ext.wcs.avilable_frames.index("rectified"))
-        assert (ref_ext.wcs.avilable_frames.index("distortion_corrected") >
-                ref_ext.wcs.avilable_frames.index("rectified"))
+        assert (ext.wcs.available_frames.index("distortion_corrected") >
+                ext.wcs.available_frames.index("rectified"))
+        assert (ref_ext.wcs.available_frames.index("distortion_corrected") >
+                ref_ext.wcs.available_frames.index("rectified"))
 
         model = ext.wcs.get_transform("pixels", "distortion_corrected")
         ref_model = ref_ext.wcs.get_transform("pixels", "distortion_corrected")

geminidr/gnirs/tests/longslit/test_determine_distortion.py

@@ -117,10 +117,10 @@ def test_regression_for_determine_distortion_using_wcs(
     ref_ad = ref_ad_factory(distortion_determined_ad.filename)
 
     # Confirm that the distortion model is placed after the rectification model
-    assert (distortion_determined_ad.wcs.avilable_frames.index("distortion_corrected") >
-            distortion_determined_ad.wcs.avilable_frames.index("rectified"))
-    assert (ref_ad.wcs.avilable_frames.index("distortion_corrected") >
-            ref_ad.wcs.avilable_frames.index("rectified"))
+    assert (distortion_determined_ad[0].wcs.available_frames.index("distortion_corrected") >
+            distortion_determined_ad[0].wcs.available_frames.index("rectified"))
+    assert (ref_ad[0].wcs.available_frames.index("distortion_corrected") >
+            ref_ad[0].wcs.available_frames.index("rectified"))
 
     model = distortion_determined_ad[0].wcs.get_transform("pixels", "distortion_corrected")
     ref_model = ref_ad[0].wcs.get_transform("pixels", "distortion_corrected")

geminidr/niri/tests/longslit/test_determine_distortion.py

@@ -96,10 +96,10 @@ def test_regression_for_determine_distortion_using_wcs(
     ref_ad = ref_ad_factory(distortion_determined_ad.filename)
 
     # Confirm that the distortion model is placed after the rectification model
-    assert (distortion_determined_ad.wcs.avilable_frames.index("distortion_corrected") >
-            distortion_determined_ad.wcs.avilable_frames.index("rectified"))
-    assert (ref_ad.wcs.avilable_frames.index("distortion_corrected") >
-            ref_ad.wcs.avilable_frames.index("rectified"))
+    assert (distortion_determined_ad[0].wcs.available_frames.index("distortion_corrected") >
+            distortion_determined_ad[0].wcs.available_frames.index("rectified"))
+    assert (ref_ad[0].wcs.available_frames.index("distortion_corrected") >
+            ref_ad[0].wcs.available_frames.index("rectified"))
 
     model = distortion_determined_ad[0].wcs.get_transform("pixels", "distortion_corrected")
     ref_model = ref_ad[0].wcs.get_transform("pixels", "distortion_corrected")