Remove references to HtmIndex20 and ap_HTMIndex (DM-32046)

Pixelization is now done internally by Apdb.
lsst · Oct 12, 2021 · f62bdcb · f62bdcb
1 parent a715d53
commit f62bdcb
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 19 deletions.
diff --git a/data/DiaSource.yaml b/data/DiaSource.yaml
@@ -22,11 +22,6 @@ funcs:
     midPointTai:
         functor: Column
         args: midPointTai
-    pixelId:
-        functor: HtmIndex20
-        args:
-            - coord_ra
-            - coord_dec
     bboxSize:
         functor: Column
         args: bboxSize

diff --git a/python/lsst/ap/association/diaPipe.py b/python/lsst/ap/association/diaPipe.py
@@ -249,7 +249,6 @@ def setDefaults(self):
             "data",
             "apdb-ap-pipe-schema-extra.yaml")
         self.diaCalculation.plugins = ["ap_meanPosition",
-                                       "ap_HTMIndex",
                                        "ap_nDiaSources",
                                        "ap_diaObjectFlag",
                                        "ap_meanFlux",
@@ -266,13 +265,6 @@ def setDefaults(self):
                                        "ap_meanTotFlux",
                                        "ap_sigmaTotFlux"]
 
-    def validate(self):
-        pexConfig.Config.validate(self)
-        # TODO: this plugin is not useful, pixelization is handled by Apdb
-        if "ap_HTMIndex" not in self.diaCalculation.plugins:
-            raise ValueError("DiaPipe requires the ap_HTMIndex plugin "
-                             "be enabled for proper insertion into the Apdb.")
-
 
 class DiaPipelineTask(pipeBase.PipelineTask):
     """Task for loading, associating and storing Difference Image Analysis

diff --git a/python/lsst/ap/association/loadDiaCatalogs.py b/python/lsst/ap/association/loadDiaCatalogs.py
@@ -145,7 +145,7 @@ def loadDiaObjects(self, region, apdb):
     @pipeBase.timeMethod
     def loadDiaSources(self, diaObjects, region, dateTime, apdb):
         """Load DiaSources from the Apdb based on their diaObjectId or
-        pixelId location.
+        location.
 
         Variable used to load sources is set in config.
 

diff --git a/python/lsst/ap/association/transformDiaSourceCatalog.py b/python/lsst/ap/association/transformDiaSourceCatalog.py
@@ -206,7 +206,6 @@ def run(self,
         diaSourceDf["midPointTai"] = diffIm.getInfo().getVisitInfo().getDate().get(system=DateTime.MJD)
         diaSourceDf["diaObjectId"] = 0
         diaSourceDf["ssObjectId"] = 0
-        diaSourceDf["pixelId"] = 0
         if self.config.doPackFlags:
             # either bitpack the flags
             self.bitPackFlags(diaSourceDf)

diff --git a/tests/data/testDiaSource.yaml b/tests/data/testDiaSource.yaml
@@ -11,9 +11,6 @@ funcs:
     midPointTai:
       functor: Column
       args: midPointTai
-    pixelId:
-      functor: Column
-      args: pixelId
     bboxSize:
         functor: Column
         args: bboxSize

diff --git a/tests/test_transformDiaSourceCatalog.py b/tests/test_transformDiaSourceCatalog.py
@@ -100,7 +100,6 @@ def test_run(self):
             self.assertEqual(src["filterName"], self.filterName)
             self.assertEqual(src["midPointTai"],
                              self.date.get(system=dafBase.DateTime.MJD))
-            self.assertEqual(src["pixelId"], 0)
             self.assertEqual(src["diaObjectId"], 0)
 
     def test_run_dia_source_wrong_flags(self):