Merge pull request #322 from a3sha2/master

compute fcon from task's res4d
PennLINC · Mar 21, 2020 · 8ea9efa · 8ea9efa
2 parents 2c47141 + 1bc2165
commit 8ea9efa
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/modules/fcon/fcon.mod b/modules/fcon/fcon.mod
@@ -234,11 +234,19 @@ for net in ${atlas_names[@]}
       then
       subroutine              @1.3  Computing network timeseries
       exec_sys rm -f ${ts[cxt]}
+      if is_image ${denoised[sub]} ; then 
       exec_xcp roi2ts.R                      \
          -i    ${denoised[sub]}                       \
          -r    ${nodemap[cxt]}               \
          -l    ${a[NodeIndex]}               \
          >>    ${ts[cxt]}
+      elif is_image ${res4d[sub]}  ; then 
+      exec_xcp roi2ts.R                      \
+         -i    ${res4d[sub]}               \
+         -r    ${nodemap[cxt]}               \
+         -l    ${a[NodeIndex]}               \
+         >>    ${ts[cxt]}
+      fi
    fi