analysis correction (thanks to the reading of Egon)

fdechaumont · Sep 8, 2022 · 98c3171 · 98c3171
1 parent 0d3c1f0
commit 98c3171
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/LMT/lmtanalysis/Animal.py b/LMT/lmtanalysis/Animal.py
@@ -622,7 +622,9 @@ def getMeanBodyLength (self, tmin=0, tmax=None):
                 continue
 
             a = self.detectionDictionnary.get( key )
-            bodySizeList.append(a.getBodySize())
+
+            if (a.isHeadAndTailDetected()):
+                bodySizeList.append(a.getBodySize())
 
         mean = np.nanmean(bodySizeList)
         print( "mean animal bodysize: "  , mean )

diff --git a/LMT/lmtanalysis/BuildEventFollowZone.py b/LMT/lmtanalysis/BuildEventFollowZone.py
@@ -83,7 +83,7 @@ def reBuildEvent( connection, file, tmin=None, tmax=None, pool = None ):
 
     for idAnimalB in pool.animalDictionnary.keys():
         print(pool.animalDictionnary[idAnimalB])
-        meanSizeB = pool.animalDictionnary[idAnimalB].getMeanBodyLength( tmax = tmax )
+        #meanSizeB = pool.animalDictionnary[idAnimalB].getMeanBodyLength( tmax = tmax )
 
         for animal in pool.animalDictionnary.keys():
             if( idAnimalB == animal ):
@@ -94,6 +94,8 @@ def reBuildEvent( connection, file, tmin=None, tmax=None, pool = None ):
 
     for idAnimalB in pool.animalDictionnary.keys():
 
+        meanSizeB = pool.animalDictionnary[idAnimalB].getMeanBodyLength( tmax = tmax )
+
         for animal in pool.animalDictionnary.keys():
             if( animal == idAnimalB ):
                 continue

diff --git a/LMT/lmtanalysis/BuildEventNest4.py b/LMT/lmtanalysis/BuildEventNest4.py
@@ -228,7 +228,7 @@ def reBuildEvent( connection, file, tmin=None, tmax=None , pool = None ):
                 if isinstance( animal , Animal ):
                     if not ( t in stopDictionnary[animal.baseId] ):
                         allStoppedInBiggestGroup = False
-                break
+                        break
 
             if allStoppedInBiggestGroup:
                 isNest= True                     

diff --git a/LMT/lmtanalysis/BuildEventWallJump.py b/LMT/lmtanalysis/BuildEventWallJump.py
@@ -88,8 +88,8 @@ def reBuildEvent( connection, file, tmin=None, tmax=None, pool = None, showGraph
 
                 if ( tt in dicA ):
 
-                    directionAnimalA = dicA[t].getDirection()
-                    directionCenterAnimal = math.atan2( centerY - dicA[t].massY, centerX - dicA[t].massX )
+                    directionAnimalA = dicA[tt].getDirection()
+                    directionCenterAnimal = math.atan2( centerY - dicA[tt].massY, centerX - dicA[tt].massX )
 
                     #same direction
                     angleDif1 = math.atan2( math.sin(directionCenterAnimal-directionAnimalA), math.cos(directionCenterAnimal-directionAnimalA) )