working on zanes tracking

Author: FedeClaudi

proj/environment/plotter.py

@@ -176,7 +176,7 @@ def _plot_current_variables(self):
             color=colors["v"],
             label="trajectory speed",
             lw=1,
-            edgecolors="white",
+            edgecolors=[0.8, 0.8, 0.8],
             s=100,
         )
 
@@ -268,7 +268,7 @@ def visualize_world_live(self, curr_goals, elapsed=None):
             s=50,
             color=colors["trajectory"],
             lw=1,
-            edgecolors="white",
+            edgecolors=[0.8, 0.8, 0.8],
         )
 
         # highlight current trajectory point
@@ -278,7 +278,7 @@ def visualize_world_live(self, curr_goals, elapsed=None):
             s=30,
             color="r",
             lw=1,
-            edgecolors="white",
+            edgecolors=[0.8, 0.8, 0.8],
             zorder=99,
         )
 

proj/environment/trajectories.py

@@ -201,14 +201,19 @@ def from_tracking(n_steps, params, planning_params, cache_fld, *args):
         trial = trials.sample().iloc[0]
 
     # Get variables
+    try:
+        fps = trial.fps
+    except:
+        fps = 60
+
     x = trial.body_xy[:, 0]
     y = trial.body_xy[:, 1]
 
     angle = interpolate_nans(trial.body_orientation)
     angle = np.radians(90 - angle)
     angle = np.unwrap(angle)
 
-    speed = line_smoother(trial.body_speed) * trial.fps
+    speed = line_smoother(trial.body_speed) * fps
     ang_speed = np.ones_like(speed)  # it will be ignored
 
     # get start frame
@@ -234,5 +239,5 @@ def from_tracking(n_steps, params, planning_params, cache_fld, *args):
     trajectory = np.vstack(vars.values()).T
 
     return compute_trajectory_stats(
-        trajectory, len(x[start:]) / trial.fps, planning_params
+        trajectory, len(x[start:]) / fps, planning_params
     )

proj/model/config.py

@@ -63,12 +63,13 @@ class Config:
 
     trajectory = dict(  # parameters of the goals trajectory
         name="tracking",
-        nsteps=1000,
+        nsteps=10000,
         distance=150,
         max_speed=100,
         min_speed=80,
         min_dist=5,  # if agent is within this distance from trajectory end the goal is considered achieved
-        dist_th=60,  # keep frames only after moved away from start location
+        # dist_th=60,  # keep frames only after moved away from start location
+        dist_th=-1,
         resample=True,  # if True when using tracking trajectory resamples it
         max_deg_interpol=8,  # if using track fit a N degree polynomial to daa to smoothen
         randomize=True,  # if true when using tracking it pulls a random trial

proj/paths.py

@@ -2,7 +2,8 @@
 from pathlib import Path
 
 if sys.platform == "darwin":
-    trials_cache = "/Users/federicoclaudi/Dropbox (UCL - SWC)/Rotation_vte/Locomotion/control/behav_data/m46_cache.h5"
+    # trials_cache = "/Users/federicoclaudi/Dropbox (UCL - SWC)/Rotation_vte/Locomotion/control/behav_data/m46_cache.h5"
+    trials_cache = "/Users/federicoclaudi/Dropbox (UCL - SWC)/Rotation_vte/Locomotion/control/behav_data/zanes.h5"
 
     main_fld = Path(
         "/Users/federicoclaudi/Dropbox (UCL - SWC)/Rotation_vte/Locomotion/control"
@@ -13,7 +14,8 @@
 
     db_app = "/Users/federicoclaudi/Dropbox (UCL - SWC)/Apps/loco_upload"
 else:
-    trials_cache = "D:\\Dropbox (UCL - SWC)\\Rotation_vte\\Locomotion\\control\\behav_data\\m46_cache.h5"
+    # trials_cache = "D:\\Dropbox (UCL - SWC)\\Rotation_vte\\Locomotion\\control\\behav_data\\m46_cache.h5"
+    trials_cache = "D:\\Dropbox (UCL - SWC)\\Rotation_vte\\Locomotion\\control\\behav_data\\zanes.h5"
 
     main_fld = Path(
         "D:\\Dropbox (UCL - SWC)\\Rotation_vte\\Locomotion\\control"
@@ -26,7 +28,12 @@
 
 # winstor paths
 winstor_main = Path("/nfs/winstor/branco/Federico/Locomotion/control/data")
+# winstor_trial_cache = (
+#     "/nfs/winstor/branco/Federico/Locomotion/control/m46_cache.h5"
+# )
+
 winstor_trial_cache = (
-    "/nfs/winstor/branco/Federico/Locomotion/control/m46_cache.h5"
+    "/nfs/winstor/branco/Federico/Locomotion/control/zanes.h5"
 )
+
 winstor_db_app = ""

proj/plotting/results.py

@@ -58,7 +58,7 @@ def _plot_xy(history, trajectory, plot_every, ax=None):
         history["x"],
         y=history["y"],
         color=colors["tracking"],
-        lw=1,
+        lw=2,
         zorder=100,
         outline_color=[0.2, 0.2, 0.2],
     )
@@ -105,7 +105,7 @@ def _plot_v(history, trajectory, plot_every, ax=None):
 
     # plot history speed
     ax.plot(
-        history["trajectory_idx"], v, color=colors["v"], lw=2, zorder=100,
+        history["trajectory_idx"], v, color=colors["v"], lw=3, zorder=100,
     )