use outDs for histogram calculation

ubarsc · Jun 13, 2024 · a325a4b · a325a4b
1 parent 1195f13
commit a325a4b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/parallel_examples/awsbatch/do_stitch.py b/parallel_examples/awsbatch/do_stitch.py
@@ -88,6 +88,7 @@ def main():
 
     # do the stitching. Note maxSegId and hasEmptySegments not used here
     # but ideally they would be saved somewhere also.
+    # Ensure histogram written to local file so we can do the statistics
     (maxSegId, hasEmptySegments, localDs) = tiling.doTiledShepherdSegmentation_finalize(
         inDs, localOutfile, tileFilenames, dataFromPickle['tileInfo'], 
         cmdargs.overlapsize, tempDir, writeHistogram=True)

diff --git a/pyshepseg/tiling.py b/pyshepseg/tiling.py
@@ -685,22 +685,22 @@ def doTiledShepherdSegmentation_finalize(inDs, outfile, tileFilenames, tileInfo,
     maxSegId, outDs = stitchTiles(inDs, outfile, tileFilenames, tileInfo, overlapSize,
         tempDir, simpleTileRecode, outputDriver, creationOptions, verbose)
 
-    hasEmptySegments = checkForEmptySegments(outfile, maxSegId, overlapSize,
+    hasEmptySegments = checkForEmptySegments(outDs, maxSegId, overlapSize,
         writeToRat=writeHistogram)
 
     return maxSegId, hasEmptySegments, outDs
 
 
-def checkForEmptySegments(outfile, maxSegId, overlapSize, writeToRat=False):
+def checkForEmptySegments(outDs, maxSegId, overlapSize, writeToRat=False):
     """
     Check the final segmentation for any empty segments. These
     can be problematic later, and should be avoided. Prints a
     warning message if empty segments are found.
 
     Parameters
     ----------
-      outfile : str
-        File name of segmentation image to check
+      outDs : gdal.Dataset
+        Open Dataset of output raster
       maxSegId : shepseg.SegIdType
         Maximum segment ID used
       overlapSize : int
@@ -712,7 +712,7 @@ def checkForEmptySegments(outfile, maxSegId, overlapSize, writeToRat=False):
         True if there are segment ID numbers with no pixels
 
     """
-    hist = calcHistogramTiled(outfile, maxSegId, writeToRat=writeToRat)
+    hist = calcHistogramTiled(outDs, maxSegId, writeToRat=writeToRat)
     emptySegIds = numpy.where(hist[1:] == 0)[0]
     numEmptySeg = len(emptySegIds)
     hasEmptySegments = (numEmptySeg > 0)