0.8.4: fixed model files containing thr30

Author: slamballais

NEWS.md

@@ -1,5 +1,11 @@
 # QDECR 0.8.3
 
+## Bug fixes
+* Fixed that the model output files (p.mgh, t.mgh, etc) also contained the mcz threshold (e.g. cache.th30).
+
+
+# QDECR 0.8.3
+
 ## Minor tweaks
 * The `mcz_thr` argument (for `qdecr` and `qdecr_fastlm`) now accepts: 13/1.3/0.05, 20/2.0/0.01, 23/2.3/0.005, 30/3.0/0.001, 33/3.3/0.0005, 40/4.0/0.0001.
 * A new function `qdecr_mcz_thr` makes sure that the value is converted to 13/20/23/30/33/40. 

R/qdecr_make_stack.R

@@ -2,14 +2,15 @@ qdecr_make_stack <- function(vw, stats, mcz_thr, clusterfiles = c("cluster.mgh",
 
     stack <- list()
     stack$names <- attr(vw$model$mm[[1]], "dimnames")[[2]]
-    
     nn1 <- c(stats, clusterfiles)
-    nn2 <- c(paste0(stats, ".mgh"), clusterfiles)
+    stats2 <- paste0(stats, ".mgh")
+    clusterfiles2 <- paste0("cache.th", mcz_thr, ".abs.sig.", clusterfiles)
+    nn2 <- c(stats2, clusterfiles2)
     for (n in nn1) stack[[n]] <- list()
 
     for(i in seq_along(stack$names)){
       for (j in seq_along(nn1)){
-        stack[[nn1[j]]][[stack$names[i]]] <- paste0(vw$paths$final_path, ".stack", i, ".cache.th", mcz_thr, ".abs.sig.", nn2[j])
+        stack[[nn1[j]]][[stack$names[i]]] <- paste0(vw$paths$final_path, ".stack", i, ".", nn2[j])
       }
     }
     stack