Merge branch 'master' into work839_955_1028_1129

wadpac · Nov 7, 2024 · 2450ca4 · 2450ca4
2 parents 6494600 + 4432223
commit 2450ca4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/R/extract_params.R b/R/extract_params.R
@@ -187,6 +187,9 @@ extract_params = function(params_sleep = c(), params_metrics = c(),
       } else if (aN %in% expected_phyact_params == TRUE) { # phyact
         params_phyact = update_params(x = params_phyact, aN, input)
       } else if (aN %in% expected_cleaning_params == TRUE) { # cleaning
+        if (aN == "data_masking_strategy") { # account for this parameter name change
+          params_cleaning[["strategy"]] = input[[aN]]
+        }
         params_cleaning = update_params(x = params_cleaning, aN, input)
       } else if (aN %in% expected_output_params == TRUE) { # output
         params_output = update_params(x = params_output, aN, input)

diff --git a/R/g.shell.GGIR.R b/R/g.shell.GGIR.R
@@ -1,4 +1,7 @@
 g.shell.GGIR = function(...) {
+  message(paste0("Please note that instead of g.shell.GGIR() you can just write ",
+                 "GGIR(), because all g.shell.GGIR() does is forward its input to ",
+                 "function GGIR()."), call. = FALSE)
   .args <- as.list(match.call()[-1])
   do.call(GGIR, .args)
 }