Skip to content

Commit

Permalink
Merge pull request #1261 from wadpac/issue1260_part6_threshold_combi
Browse files Browse the repository at this point in the history
Issue1260 part6 threshold combi
  • Loading branch information
vincentvanhees authored Jan 29, 2025
2 parents b109e81 + b7d4ceb commit 841cd18
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# CHANGES IN GGIR VERSION 3.X-Y

- Part 6 and visual report: Fix bug related to determining the combination of threhsolds to use for the
visual report and for part 6 analyses when there are several options and
part6_threshold_combi is NULL. #1260

# CHANGES IN GGIR VERSION 3.1-11

- Part 2:
Expand Down
6 changes: 3 additions & 3 deletions R/check_params.R
Original file line number Diff line number Diff line change
Expand Up @@ -364,9 +364,9 @@ check_params = function(params_sleep = c(), params_metrics = c(),
if ((length(params_phyact[["threshold.lig"]]) == 1 &&
length(params_phyact[["threshold.mod"]]) == 1 &&
length(params_phyact[["threshold.vig"]]) == 1) | is.null(params_phyact[["part6_threshold_combi"]])) {
params_phyact[["part6_threshold_combi"]] = paste(params_phyact[["threshold.lig"]],
params_phyact[["threshold.mod"]],
params_phyact[["threshold.vig"]], sep = "_")
params_phyact[["part6_threshold_combi"]] = paste(params_phyact[["threshold.lig"]][1],
params_phyact[["threshold.mod"]][1],
params_phyact[["threshold.vig"]][1], sep = "_")
}
}
# params output
Expand Down

0 comments on commit 841cd18

Please sign in to comment.