Update method to merge configs that allows registries.

lsst · Nov 5, 2021 · 34d4f2c · 34d4f2c
1 parent 4927fbd
commit 34d4f2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/python/lsst/pipe/tasks/makeDiscreteSkyMap.py b/python/lsst/pipe/tasks/makeDiscreteSkyMap.py
@@ -199,7 +199,10 @@ def run(self, wcs_bbox_tuple_list, oldSkyMap=None):
             skyMapConfig.raList.extend(oldSkyMap.config.raList)
             skyMapConfig.decList.extend(oldSkyMap.config.decList)
             skyMapConfig.radiusList.extend(oldSkyMap.config.radiusList)
-        skyMapConfig.update(**self.config.skyMap.toDict())
+        configIntersection = {k: getattr(self.config.skyMap, k)
+                              for k in self.config.skyMap.toDict()
+                              if k in skyMapConfig}
+        skyMapConfig.update(**configIntersection)
         circleCenter = lsst.sphgeom.LonLat(circle.getCenter())
         skyMapConfig.raList.append(circleCenter[0].asDegrees())
         skyMapConfig.decList.append(circleCenter[1].asDegrees())

diff --git a/tests/test_makeDiscreteSkyMap.py b/tests/test_makeDiscreteSkyMap.py
@@ -25,7 +25,8 @@
 
 from lsst.utils import getPackageDir
 import lsst.utils.tests
-from lsst.geom import Extent2I, Box2D
+from lsst.geom import Box2D
+from lsst.skymap import Index2D
 from lsst.daf.persistence import Butler
 from lsst.pipe.tasks.makeDiscreteSkyMap import MakeDiscreteSkyMapTask, DiscreteSkyMap
 
@@ -75,7 +76,7 @@ def testBasics(self):
         self.assertEqual(len(skyMap), 1)
         tractInfo = skyMap[0]
         self.assertEqual(tractInfo.getId(), 0)
-        self.assertEqual(tractInfo.getNumPatches(), Extent2I(3, 3))
+        self.assertEqual(tractInfo.getNumPatches(), Index2D(x=3, y=3))
         tractWcs = tractInfo.getWcs()
         tractBoxD = Box2D(tractInfo.getBBox())
         for skyPoint in coordList: