curious.bio/planktoscope
curious.bio/planktoscope
9
0
Fork 0
Code Issues 10 Pull requests Packages Projects 7 Releases Wiki Activity

segmenter: fix median bug calculation

Browse source 
(cherry picked from commit c5f5745d110a3e88fca638f2051413f656115f74)
This commit is contained in:
Romain Bazile 2021-06-02 14:09:25 +02:00 committed by Romain Bazile
parent 4dca53e2e4
commit 43f01fa893
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/planktoscope/segmenter/__init__.py
View file

@ -120,9 +120,9 @@ class SegmenterProcess(multiprocessing.Process):
filenames = sorted(filenames) filenames = sorted(filenames)
return [fn for fn in filenames if fn.endswith(extension)] return [fn for fn in filenames if fn.endswith(extension)]
def _manual_median(self, array_of_5): def _manual_median(self, images_array):
array_of_5.sort(axis=0) images_array.sort(axis=0)
return array_of_5[2] return images_array[int(len(images_array) / 2)]
def _save_image(self, image, path): def _save_image(self, image, path):
PIL.Image.fromarray(cv2.cvtColor(image, cv2.COLOR_BGR2RGB)).save(path) PIL.Image.fromarray(cv2.cvtColor(image, cv2.COLOR_BGR2RGB)).save(path)
@ -131,7 +131,22 @@ class SegmenterProcess(multiprocessing.Process):
PIL.Image.fromarray(mask).save(path) PIL.Image.fromarray(mask).save(path)
def _calculate_flat(self, images_list, images_number, images_root_path): def _calculate_flat(self, images_list, images_number, images_root_path):
"""Calculate a flat image from given list and images number
Args:
images_list (string): list of filenames to calculate a flat for
images_number (int): image number to use, must be odd!
images_root_path (string): path where to find the images
Returns:
image: median of previously sent images
"""
# TODO make this calculation optional if a flat already exists # TODO make this calculation optional if a flat already exists
# check to make sure images_number is odd
if not images_number % 2:
images_number -= 1
# make sure image number is smaller than image list # make sure image number is smaller than image list
if images_number > len(images_list): if images_number > len(images_list):
logger.error( logger.error(