diff --git a/support_code/behavior_summaries.R b/support_code/behavior_summaries.R index b33a450..6891d7f 100644 --- a/support_code/behavior_summaries.R +++ b/support_code/behavior_summaries.R @@ -29,7 +29,7 @@ data_agg <- lapply(seq_along(row_num), function(x) { tmp <- data |> group_by(MouseID) |> filter(row_number() <= row_num[x]) tmpsum <- rowsum(tmp[,sapply(tmp, is.numeric)], tmp$MouseID) - tmpsum <- tmpsum |> mutate(!!paste0("bin_avg_", row_num[x]*5, ".", behavior, "_time_secs") := get(paste0(behavior, "_time_behavior"))/(get(paste0(behavior, "_time_behavior")) + get(paste0(behavior, "_time_not_behavior")))*row_num[x]*5, !!paste0("bin_avg_", row_num[x]*5, ".", behavior, "_distance_cm") := get(paste0(behavior, "_behavior_dist"))/(row_num[x]*5)) + tmpsum <- tmpsum |> mutate(!!paste0("bin_avg_", row_num[x]*5, ".", behavior, "_time_min") := get(paste0(behavior, "_time_behavior"))/(get(paste0(behavior, "_time_behavior")) + get(paste0(behavior, "_time_not_behavior")))*row_num[x]*5, !!paste0("bin_avg_", row_num[x]*5, ".", behavior, "_distance_cm") := get(paste0(behavior, "_behavior_dist"))/(row_num[x]*5)) tmpsum$MouseID <- rownames(tmpsum) tmpsum <- tmpsum |> select(!all_of(cols_to_exclude)) diff --git a/support_code/behavior_summaries.py b/support_code/behavior_summaries.py index a24a26f..a178ddd 100644 --- a/support_code/behavior_summaries.py +++ b/support_code/behavior_summaries.py @@ -141,9 +141,9 @@ def aggregate_data_by_bin_size( behavior_dist_col = f"{behavior}_behavior_dist" behavior_bout_col = f"{behavior}_bout_behavior" - # Calculate time spent in behavior + # Calculate time spent in behavior (in minutes) # TODO: Do we need to make `5` a configurable parameter? - aggregated[f"bin_sum_{bin_size * 5}.{behavior}_time_secs"] = ( + aggregated[f"bin_sum_{bin_size * 5}.{behavior}_time_min"] = ( aggregated[time_behavior_col] / (aggregated[time_behavior_col] + aggregated[time_not_behavior_col]) * bin_size