Added logic for MPSkyEphemerisQueryTask

lsst · Aug 28, 2024 · 53360ff · 53360ff
1 parent f7c679c
commit 53360ff
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 25 deletions.
diff --git a/doc/lsst.ap.verify/index.rst b/doc/lsst.ap.verify/index.rst
@@ -25,6 +25,7 @@ Using lsst.ap.verify
    datasets
    new-metrics
    command-line-reference
+   limitations
 
 .. _lsst.ap.verify-contributing:
 

diff --git a/doc/lsst.ap.verify/request.rst b/doc/lsst.ap.verify/request.rst
diff --git a/python/lsst/ap/verify/testPipeline.py b/python/lsst/ap/verify/testPipeline.py
@@ -34,7 +34,7 @@
 import lsst.afw.image as afwImage
 import lsst.afw.math as afwMath
 import lsst.afw.table as afwTable
-from lsst.ap.association import (LoadDiaCatalogsConfig,TransformDiaSourceCatalogConfig,
+from lsst.ap.association import (LoadDiaCatalogsConfig, TransformDiaSourceCatalogConfig,
                                  DiaPipelineConfig, FilterDiaSourceCatalogConfig,
                                  MPSkyEphemerisQueryConfig)
 from lsst.pipe.base import PipelineTask, Struct

diff --git a/tests/test_testPipeline.py b/tests/test_testPipeline.py
@@ -43,9 +43,7 @@
     MockAlardLuptonSubtractTask, MockDetectAndMeasureTask, MockTransformDiaSourceCatalogTask, \
     MockRBTransiNetTask, MockDiaPipelineTask, MockFilterDiaSourceCatalogTask, \
     MockSpatiallySampledMetricsTask, MockMPSkyEphemerisQueryTask, MockLoadDiaCatalogsTask
-from lsst.daf.butler import Timespan
 from lsst.sphgeom import Circle
-from lsst.pipe.base.utils import RegionTimeInfo
 
 
 class MockTaskTestSuite(unittest.TestCase):
@@ -85,11 +83,7 @@ def setUpClass(cls):
         butlerTests.addDataIdValue(cls.repo, "subfilter", SUB_FILTER)
         butlerTests.addDataIdValue(cls.repo, "exposure", VISIT)
         butlerTests.addDataIdValue(cls.repo, "visit", VISIT)
-<<<<<<< HEAD
-        butlerTests.addDataIdValue(cls.repo, "group", VISIT)
-=======
         butlerTests.addDataIdValue(cls.repo, "group", GROUP)
->>>>>>> 60d8a8d (Move loadDiaCatalogs to standalone pipelineTask)
         butlerTests.addDataIdValue(cls.repo, "detector", CCD)
         butlerTests.addDataIdValue(cls.repo, "skymap", SKYMAP)
         butlerTests.addDataIdValue(cls.repo, "tract", TRACT)
@@ -101,11 +95,7 @@ def setUpClass(cls):
         cls.visitId = cls.repo.registry.expandDataId(
             {"instrument": INSTRUMENT, "visit": VISIT, "detector": CCD})
         cls.groupId = cls.repo.registry.expandDataId(
-<<<<<<< HEAD
-            {"instrument": INSTRUMENT, "group": VISIT, "detector": CCD})
-=======
             {"instrument": INSTRUMENT, "group": GROUP, "detector": CCD})
->>>>>>> 60d8a8d (Move loadDiaCatalogs to standalone pipelineTask)
         cls.visitOnlyId = cls.repo.registry.expandDataId(
             {"instrument": INSTRUMENT, "visit": VISIT})
         cls.skymapId = cls.repo.registry.expandDataId({"skymap": SKYMAP})
@@ -152,7 +142,7 @@ def setUpClass(cls):
         butlerTests.addDatasetType(cls.repo, "deepDiff_candidateDiaSrc", cls.visitId.dimensions,
                                    "SourceCatalog")
         butlerTests.addDatasetType(cls.repo, "visitSsObjects", cls.visitOnlyId.dimensions, "DataFrame")
-        butlerTests.addDatasetType(cls.repo, "preloaded_ssObjects", cls.groupId.dimensions, "DataFrame")
+        butlerTests.addDatasetType(cls.repo, "preloaded_SsObjects", cls.groupId.dimensions, "DataFrame")
         butlerTests.addDatasetType(cls.repo, "regionTimeInfo", cls.groupId.dimensions, "RegionTimeInfo")
         butlerTests.addDatasetType(cls.repo, "apdb_marker", cls.visitId.dimensions, "Config")
         butlerTests.addDatasetType(cls.repo, "deepDiff_assocDiaSrc", cls.visitId.dimensions, "DataFrame")
@@ -416,7 +406,7 @@ def testMockDiaPipelineTask(self):
         self.butler.put(pandas.DataFrame(), "preloaded_diaSources", self.groupId)
         self.butler.put(pandas.DataFrame(), "preloaded_diaForcedSources", self.groupId)
         self.butler.put(pandas.DataFrame(), "deepDiff_diaSrcTable", self.visitId)
-        self.butler.put(pandas.DataFrame(), "preloaded_ssObjects", self.groupId)
+        self.butler.put(pandas.DataFrame(), "preloaded_SsObjects", self.groupId)
         self.butler.put(afwImage.ExposureF(), "deepDiff_differenceExp", self.visitId)
         self.butler.put(afwImage.ExposureF(), "calexp", self.visitId)
         self.butler.put(afwImage.ExposureF(), "deepDiff_templateExp", self.visitId)