Skip to content

Commit

Permalink
avoid naming clash when merging position dataframes
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelbray32 committed Mar 13, 2024
1 parent 105182d commit 9b8c453
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,9 @@ def get_position_with_corrected_timestamps(position_tracking_path, ptp_enabled):
# Additionally, for offline tracking, frames can be skipped if the
# frame is labeled as bad.
video_position_info = pd.merge(
video_info, position_tracking, right_index=True, left_index=True, how="left"
)
video_info.drop(columns=[x for x in ['xloc','yloc','xloc2','yloc2'] if x in video_info.columns]),
position_tracking, right_index=True, left_index=True, how="left"
)

if ptp_enabled:
logger.info("PTP detected")
Expand Down

0 comments on commit 9b8c453

Please sign in to comment.