From b3863585cfeb4801ab0ad8ee29ba6e1321ea57e2 Mon Sep 17 00:00:00 2001 From: Ante Date: Mon, 9 Dec 2024 15:32:48 +0100 Subject: [PATCH] Add missing for loop. --- zebrazoom/code/tracking/tracking.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/zebrazoom/code/tracking/tracking.py b/zebrazoom/code/tracking/tracking.py index fbbc2a5c..7b48b781 100644 --- a/zebrazoom/code/tracking/tracking.py +++ b/zebrazoom/code/tracking/tracking.py @@ -451,16 +451,17 @@ def runTracking(self, wellNumber, background=None): # Eye tracking for frame i if self._hyperparameters["eyeTracking"]: - if self._hyperparameters["headEmbeded"] == 1: - if self._hyperparameters["adjustHeadEmbeddedEyeTracking"]: - i, widgets = self._eyeTrackingHeadEmbedded(animalId, i, frame, thresh1, self._trackingHeadingAllAnimals, self._trackingHeadTailAllAnimals, self._trackingEyesAllAnimals, leftEyeCoordinate, rightEyeCoordinate, widgets=widgets) - if not self._hyperparameters["eyeFilterKernelSize"] % 2: - self._hyperparameters["eyeFilterKernelSize"] -= 1 - continue + for animalId in range(self._hyperparameters["nbAnimalsPerWell"]): + if self._hyperparameters["headEmbeded"] == 1: + if self._hyperparameters["adjustHeadEmbeddedEyeTracking"]: + i, widgets = self._eyeTrackingHeadEmbedded(animalId, i, frame, thresh1, self._trackingHeadingAllAnimals, self._trackingHeadTailAllAnimals, self._trackingEyesAllAnimals, leftEyeCoordinate, rightEyeCoordinate, widgets=widgets) + if not self._hyperparameters["eyeFilterKernelSize"] % 2: + self._hyperparameters["eyeFilterKernelSize"] -= 1 + continue + else: + self._eyeTrackingHeadEmbedded(animalId, i, frame, thresh1, self._trackingHeadingAllAnimals, self._trackingHeadTailAllAnimals, self._trackingEyesAllAnimals, leftEyeCoordinate, rightEyeCoordinate) else: - self._eyeTrackingHeadEmbedded(animalId, i, frame, thresh1, self._trackingHeadingAllAnimals, self._trackingHeadTailAllAnimals, self._trackingEyesAllAnimals, leftEyeCoordinate, rightEyeCoordinate) - else: - self._eyeTracking(animalId, i, frame, thresh1, self._trackingHeadingAllAnimals, self._trackingHeadTailAllAnimals, self._trackingEyesAllAnimals) + self._eyeTracking(animalId, i, frame, thresh1, self._trackingHeadingAllAnimals, self._trackingHeadTailAllAnimals, self._trackingEyesAllAnimals) # Debug functions if self._hyperparameters["nbAnimalsPerWell"] > 1 or self._hyperparameters["forceBlobMethodForHeadTracking"] or self._hyperparameters["headEmbeded"] == 1 or self._hyperparameters["fixedHeadPositionX"] != -1: