Merge pull request #355 from a3sha2/master

update task for acompcor and acompcor_gsr
PennLINC · Jun 29, 2020 · e290d98 · e290d98
2 parents 6edea31 + 8a84acd
commit e290d98
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/modules/task/task.mod b/modules/task/task.mod
@@ -780,8 +780,14 @@ done
     exec_xcp mbind.R -x    ${confmat[cxt]}  -y    OPdx${dx} -o    ${confmat_path}
     output   confmat           ${prefix}_confmat.1D
     ac_path=${outdir}/${prefix}_acompcor.1D
+    if [[ -f ${confjson[cxt]} ]]; then 
+    exec_xcp acompcor_select.py -j ${confjson[cxt]} -c ${fmriprepconf[cxt]} \
+    -o  ${ac_path} 
+    output acp  ${prefix}_acompcor.1D
+    else
     exec_xcp generate_confmat.R -i ${fmriprepconf[cxt]} -j aCompCor  -o ${ac_path}
     output acp  ${prefix}_acompcor.1D
+    fi
     exec_xcp mbind.R  -x ${confmat[cxt]} -y ${acp[cxt]} -o ${confmat_path} 
     output confmat             ${prefix}_confmat.1D
   elif [[ ${task_confound[cxt]} == aroma  ]]; then