Merge pull request #1115 from lsst/tickets/DM-47916

DM-47916: Remove deprecated makeWarp and warpAndPsfMatch

Author: arunkannawadi

doc/lsst.pipe.tasks/index.rst

@@ -159,9 +159,6 @@ Python API reference
 .. automodapi:: lsst.pipe.tasks.makeDiscreteSkyMap
    :no-inheritance-diagram:
 
-.. automodapi:: lsst.pipe.tasks.makeWarp
-   :no-inheritance-diagram:
-
 .. automodapi:: lsst.pipe.tasks.matchBackgrounds
    :no-inheritance-diagram:
 

doc/lsst.pipe.tasks/tasks/lsst.pipe.tasks.makeWarp.MakeWarpTask.rst

@@ -198,6 +198,45 @@ def reorderAndPadList(inputList, inputKeys, outputKeys, padWith=None):
     return outputList
 
 
+def reorderRefs(inputRefs, outputSortKeyOrder, dataIdKey):
+    """Reorder inputRefs per outputSortKeyOrder.
+
+    Any inputRefs which are lists will be resorted per specified key e.g.,
+    'detector.' Only iterables will be reordered, and values can be of type
+    `lsst.pipe.base.connections.DeferredDatasetRef` or
+    `lsst.daf.butler.core.datasets.ref.DatasetRef`.
+
+    Returned lists of refs have the same length as the outputSortKeyOrder.
+    If an outputSortKey not in the inputRef, then it will be padded with None.
+    If an inputRef contains an inputSortKey that is not in the
+    outputSortKeyOrder it will be removed.
+
+    Parameters
+    ----------
+    inputRefs : `lsst.pipe.base.connections.QuantizedConnection`
+        Input references to be reordered and padded.
+    outputSortKeyOrder : `iterable`
+        Iterable of values to be compared with inputRef's dataId[dataIdKey].
+    dataIdKey : `str`
+        The data ID key in the dataRefs to compare with the outputSortKeyOrder.
+
+    Returns
+    -------
+    inputRefs : `lsst.pipe.base.connections.QuantizedConnection`
+        Quantized Connection with sorted DatasetRef values sorted if iterable.
+    """
+    for connectionName, refs in inputRefs:
+        if isinstance(refs, Iterable):
+            if hasattr(refs[0], "dataId"):
+                inputSortKeyOrder = [ref.dataId[dataIdKey] for ref in refs]
+            else:
+                inputSortKeyOrder = [handle.datasetRef.dataId[dataIdKey] for handle in refs]
+            if inputSortKeyOrder != outputSortKeyOrder:
+                setattr(inputRefs, connectionName,
+                        reorderAndPadList(refs, inputSortKeyOrder, outputSortKeyOrder))
+    return inputRefs
+
+
 def subBBoxIter(bbox, subregionSize):
     """Iterate over subregions of a bbox.
 

doc/lsst.pipe.tasks/tasks/lsst.pipe.tasks.warpAndPsfMatch.WarpAndPsfMatchTask.rst

@@ -37,7 +37,7 @@
 import lsst.afw.image as afwImage
 import lsst.afw.table as afwTable
 
-from .makeWarp import reorderRefs
+from .coaddBase import reorderRefs
 
 
 deblendBaseTemplates = {"inputCoaddName": "deep", "outputCoaddName": "deep"}