Merge pull request #133 from oliviermirat/fix

Add missing for loop.
oliviermirat · Dec 10, 2024 · 0d5f51f · 0d5f51f · oliviermirat · Dec 10, 2024
2 parents bfa3b6d + b386358
commit 0d5f51f
Showing 1 changed file with 10 additions and 9 deletions.
diff --git 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: