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

segmenter: fix bug when less than 20 images are segmented

Browse source
This commit is contained in:
Romain Bazile 2021-08-20 14:59:20 +02:00
parent c120a0177c
commit 1fa40167d6
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -576,6 +576,7 @@ class SegmenterProcess(multiprocessing.Process):
# TODO check image list here to find if a flat exists # TODO check image list here to find if a flat exists
# we recalculate the flat every 10 pictures # we recalculate the flat every 10 pictures
if recalculate_flat: if recalculate_flat:
recalculate_flat = False
self.segmenter_client.client.publish( self.segmenter_client.client.publish(
"status/segmenter", '{"status":"Calculating flat"}' "status/segmenter", '{"status":"Calculating flat"}'
) )
@ -585,7 +586,6 @@ class SegmenterProcess(multiprocessing.Process):
) )
else: else:
self._calculate_flat(images_list[0:10], 10, self.__working_path) self._calculate_flat(images_list[0:10], 10, self.__working_path)
recalculate_flat = False
if self.__save_debug_img: if self.__save_debug_img:
self._save_image( self._save_image(
@ -607,7 +607,11 @@ class SegmenterProcess(multiprocessing.Process):
# we recalculate the flat if the heuristics detected we should # we recalculate the flat if the heuristics detected we should
if recalculate_flat: # not i % 10 and i < (images_count - 10) if recalculate_flat: # not i % 10 and i < (images_count - 10)
if i > (len(images_list) - 11): recalculate_flat = False
if len(images_list) == 10:
# We are too close to the end of the list, take the previous 10 images instead of the next 10
flat = self._calculate_flat(images_list, 10, self.__working_path)
elif i > (len(images_list) - 11):
# We are too close to the end of the list, take the previous 10 images instead of the next 10 # We are too close to the end of the list, take the previous 10 images instead of the next 10
flat = self._calculate_flat( flat = self._calculate_flat(
images_list[i - 10 : i], 10, self.__working_path images_list[i - 10 : i], 10, self.__working_path
@ -616,7 +620,6 @@ class SegmenterProcess(multiprocessing.Process):
flat = self._calculate_flat( flat = self._calculate_flat(
images_list[i : i + 10], 10, self.__working_path images_list[i : i + 10], 10, self.__working_path
) )
recalculate_flat = False
if self.__save_debug_img: if self.__save_debug_img:
self._save_image( self._save_image(
self.__flat, self.__flat,
@ -662,7 +665,7 @@ class SegmenterProcess(multiprocessing.Process):
objects_count, _ = self._slice_image(img, name, mask, total_objects) objects_count, _ = self._slice_image(img, name, mask, total_objects)
total_objects += objects_count total_objects += objects_count
# Simple heuristic to detect a movement of the flow cell and a change in the resulting flat # Simple heuristic to detect a movement of the flow cell and a change in the resulting flat
if objects_count > average_objects + 20: if average_objects != 0 and objects_count > average_objects + 20:
logger.debug( logger.debug(
f"We need to recalculate a flat since we have {objects_count} new objects instead of the average of {average_objects}" f"We need to recalculate a flat since we have {objects_count} new objects instead of the average of {average_objects}"
) )