BUG: wrong column name

spatialtopology · May 30, 2024 · 4a1250f · 4a1250f
1 parent 8622513
commit 4a1250f
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/spacetop_prep/events/bidsify_dryrun_social.py b/spacetop_prep/events/bidsify_dryrun_social.py
@@ -314,12 +314,18 @@ def is_equivalent(val1, val2, tolerance=1):
 
 
     # 3-2. Calculate the angle in radians and then convert to degrees 
-    traj_df['expectangle_degrees'] = calc_adjusted_angle_df(
+    traj_df['adjusted_expectangle_degrees'] = calc_adjusted_angle_df(
         traj_df, 'expectrating_end_x', 'expectrating_end_y', trajectory_x, trajectory_y)
-    traj_df['outcomeangle_degrees'] = calc_adjusted_angle_df(
+    traj_df['adjusted_outcomeangle_degrees'] = calc_adjusted_angle_df(
         traj_df, 'outcomerating_end_x', 'outcomerating_end_y', trajectory_x, trajectory_y)
 
 
+    # traj_df['expectangle_degrees'] = calc_adjusted_angle_df(
+    #     traj_df, 'expectrating_end_x', 'expectrating_end_y', trajectory_x, trajectory_y)
+    # traj_df['outcomeangle_degrees'] = calc_adjusted_angle_df(
+    #     traj_df, 'outcomerating_end_x', 'outcomerating_end_y', trajectory_x, trajectory_y)
+
+
 
     # 3-3. check if the calculated new degree matches the one in beh_df
     beh_df['event02_expect_fillna'] = beh_df['event02_expect_angle'].round(2)
@@ -555,12 +561,17 @@ def is_equivalent(val1, val2, tolerance=1):
 
     # 3-1. calculate degree based on x, y coordinate
     # 3-2. Calculate the angle in radians and then convert to degrees 
-    traj_df['expectangle_degrees'] = calc_adjusted_angle_df(
+    # traj_df['expectangle_degrees'] = calc_adjusted_angle_df(
+    #     traj_df, 'expectrating_end_x', 'expectrating_end_y', trajectory_x, trajectory_y)
+    # traj_df['outcomeangle_degrees'] = calc_adjusted_angle_df(
+    #     traj_df, 'outcomerating_end_x', 'outcomerating_end_y', trajectory_x, trajectory_y)
+    traj_df['adjusted_expectangle_degrees'] = calc_adjusted_angle_df(
         traj_df, 'expectrating_end_x', 'expectrating_end_y', trajectory_x, trajectory_y)
-    traj_df['outcomeangle_degrees'] = calc_adjusted_angle_df(
+    traj_df['adjusted_outcomeangle_degrees'] = calc_adjusted_angle_df(
         traj_df, 'outcomerating_end_x', 'outcomerating_end_y', trajectory_x, trajectory_y)
 
 
+
     # 3-3. check if the calculated new degree matches the one in beh_df
     beh_df['event02_expect_fillna'] = beh_df['event02_expect_angle'].round(2)
     beh_df['event02_expect_fillna'].fillna(traj_df['adjusted_expectangle_degrees'].round(2), inplace=True)
@@ -806,12 +817,17 @@ def is_equivalent(val1, val2, tolerance=1):
 
 
     # 3-1. calculate degree based on x, y coordinate
-    traj_df['expectangle_degrees'] = calc_adjusted_angle_df(
+    # traj_df['expectangle_degrees'] = calc_adjusted_angle_df(
+    #     traj_df, 'expectrating_end_x', 'expectrating_end_y', trajectory_x, trajectory_y)
+    # traj_df['outcomeangle_degrees'] = calc_adjusted_angle_df(
+    #     traj_df, 'outcomerating_end_x', 'outcomerating_end_y', trajectory_x, trajectory_y)
+    traj_df['adjusted_expectangle_degrees'] = calc_adjusted_angle_df(
         traj_df, 'expectrating_end_x', 'expectrating_end_y', trajectory_x, trajectory_y)
-    traj_df['outcomeangle_degrees'] = calc_adjusted_angle_df(
+    traj_df['adjusted_outcomeangle_degrees'] = calc_adjusted_angle_df(
         traj_df, 'outcomerating_end_x', 'outcomerating_end_y', trajectory_x, trajectory_y)
 
 
+
     # 3-3. check if the calculated new degree matches the one in beh_df
     beh_df['event02_expect_fillna'] = beh_df['event02_expect_angle'].round(2)
     beh_df['event02_expect_fillna'].fillna(traj_df['adjusted_expectangle_degrees'].round(2), inplace=True)