Merge pull request #295 from lsst/tickets/DM-42814

DM-42814: Cleanup makeKernel candidateList handling
lsst · Feb 21, 2024 · c18e0e7 · c18e0e7
2 parents 5d89126 + 6f13da2
commit c18e0e7
Show file tree

Hide file tree

Showing 22 changed files with 389 additions and 2,621 deletions.
diff --git a/include/lsst/ip/diffim.h b/include/lsst/ip/diffim.h
@@ -30,11 +30,9 @@
 #include "lsst/ip/diffim/BasisLists.h"
 #include "lsst/ip/diffim/ImageSubtract.h"
 #include "lsst/ip/diffim/ImageStatistics.h"
-#include "lsst/ip/diffim/FindSetBits.h"
 
 #include "lsst/ip/diffim/KernelSolution.h"
 #include "lsst/ip/diffim/KernelCandidate.h"
-#include "lsst/ip/diffim/KernelCandidateDetection.h"
 
 #include "lsst/ip/diffim/KernelPca.h"
 #include "lsst/ip/diffim/AssessSpatialKernelVisitor.h"

diff --git a/include/lsst/ip/diffim/FindSetBits.h b/include/lsst/ip/diffim/FindSetBits.h
diff --git a/include/lsst/ip/diffim/KernelCandidateDetection.h b/include/lsst/ip/diffim/KernelCandidateDetection.h
diff --git a/python/lsst/ip/diffim/SConscript b/python/lsst/ip/diffim/SConscript
@@ -4,11 +4,9 @@ scripts.BasicSConscript.python(['_ipdiffimLib'], [
     '_ipdiffimLib.cc',
     'basisLists.cc',
     'dipoleAlgorithms.cc',
-    'findSetBits.cc',
     'imageStatistics.cc',
     'imageSubtract.cc',
     'kernelCandidate.cc',
-    'kernelCandidateDetection.cc',
     'kernelSolution.cc',
     'detail/assessSpatialKernelVisitor.cc',
     'detail/buildSingleKernelVisitor.cc',

diff --git a/python/lsst/ip/diffim/__init__.py b/python/lsst/ip/diffim/__init__.py
@@ -30,13 +30,8 @@
 from .modelPsfMatch import *
 from .makeKernel import *
 from .makeKernelBasisList import *
-from .diaCatalogSourceSelector import *
 from .dipoleMeasurement import *
-from .diffimTools import *
-from .kernelCandidateQa import *
 from .getTemplate import *
-from .diaCatalogSourceSelector import *
-from lsst.meas.base import wrapSimpleAlgorithm
 from .dipoleFitTask import *
 from .detectAndMeasure import *
 from .imageDecorrelation import *
@@ -45,6 +40,7 @@
 from .version import *
 
 # automatically register ip_diffim Algorithms
+from lsst.meas.base import wrapSimpleAlgorithm
 wrapSimpleAlgorithm(NaiveDipoleCentroid, Control=DipoleCentroidControl, executionOrder=0.0)
 wrapSimpleAlgorithm(NaiveDipoleFlux, Control=DipoleFluxControl, executionOrder=2.0)
 wrapSimpleAlgorithm(PsfDipoleFlux, Control=PsfDipoleFluxControl, executionOrder=2.0)

diff --git a/python/lsst/ip/diffim/_ipdiffimLib.cc b/python/lsst/ip/diffim/_ipdiffimLib.cc
@@ -33,11 +33,9 @@ namespace ip {
 namespace diffim {
 void wrapBasisLists(WrapperCollection &wrappers);
 void wrapDipoleAlgorithms(WrapperCollection &wrappers);
-void wrapFindSetBits(WrapperCollection &wrappers);
 void wrapImageStatistics(WrapperCollection &wrappers);
 void wrapImageSubtract(WrapperCollection &wrappers);
 void wrapKernelCandidate(WrapperCollection &wrappers);
-void wrapKernelCandidateDetection(WrapperCollection &wrappers);
 void wrapKernelSolution(WrapperCollection &wrappers);
 namespace detail {
     void wrapAssessSpatialKernelVisitor(WrapperCollection &wrappers);
@@ -58,11 +56,9 @@ PYBIND11_MODULE(_ipdiffimLib, mod) {
 
     wrapBasisLists(wrappers);
     wrapDipoleAlgorithms(wrappers);
-    wrapFindSetBits(wrappers);
     wrapImageStatistics(wrappers);
     wrapImageSubtract(wrappers);
     wrapKernelCandidate(wrappers);
-    wrapKernelCandidateDetection(wrappers);
     wrapKernelSolution(wrappers);
     detail::wrapAssessSpatialKernelVisitor(wrappers);
     detail::wrapBuildSingleKernelVisitor(wrappers);