WIP: HLA-1251: Include "modest" sized sources on the deblend list

CHANGELOG.rst

@@ -20,6 +20,11 @@ number of the code change for that issue.  These PRs can be viewed at:
 
 3.7.1 (unreleased)
 ======================
+- Added the modest and smaller sized segments (segments < kernel size) to
+  the list of segments to be deblended.  These segments were inadvertently
+  left off the deblending list when the code was updated to handle enormously
+  large segments. [#1801]
+
 - Exclude single filter images from the generation of the total detection
   image to minimize cosmic ray contamination, unless there are only single
   filter images in the visit. [#1797]

drizzlepac/haputils/catalog_utils.py

@@ -2794,6 +2794,10 @@ def _evaluate_segmentation_image(self, segm_img, image_data, big_island_only=Fal
         segm_img.big_segments = None
         big_segments = np.where(segm_img.areas >= deb_limit)[0] + 1  # Segment labels are 1-based
 
+        # Get the labels of the modest sized segments as these should also be
+        # deblended as necessary
+        modest_segments = np.where(segm_img.areas < deb_limit)[0] + 1
+
         # The biggest_source may be > max_biggest_source indicating there are "big islands"
         # and is_poor_quality should be set to True.  The is_poor_quality is only an indicator that
         # a different kernel type or background computation could be tried for improved results.
@@ -2841,10 +2845,17 @@ def _evaluate_segmentation_image(self, segm_img, image_data, big_island_only=Fal
                 segm_img.big_segments = big_segments
             else:
                 segm_img.big_segments = None
-            log.info("Total number of sources suitable for deblending: {}".format(len(big_segments)))
+            log.info("Total number of big sources suitable for deblending: {}".format(len(big_segments)))
         else:
             log.info("There are no big segments larger than the deblending limit.")
 
+        # Add the modest sized segments to the deblending array
+        if modest_segments.size > 0 and segm_img.big_segments is not None:
+            segm_img.big_segments = np.concatenate((segm_img.big_segments, modest_segments))
+        elif modest_segments.size > 0:
+            segm_img.big_segments =  modest_segments
+        log.info("Total number of all sources suitable for deblending: {}".format(len(segm_img.big_segments)))
+
         # Always compute the source_fraction so the value can be reported.  Setting the
         # big_island_only parameter allows control over whether the source_fraction should
         # or should not be ignored.

tests/hap/test_alignpipe_randomlist.py

@@ -56,6 +56,7 @@ def pytest_generate_tests(metafunc):
 @pytest.mark.bigdata
 @pytest.mark.slow
 @pytest.mark.unit
+@pytest.mark.skip(reason="Test designed to run *large* numbers of datasets for alignment statistics.")
 def test_alignpipe_randomlist(tmpdir, dataset):
     """ Tests which validate whether mosaics can be aligned to an astrometric standard.