Merge branch 'master' of https://github.com/fcp-indi/nipype

Author: pintohutch

nipype/interfaces/fsl/model.py

@@ -250,13 +250,22 @@ def _create_ev_files(
                                                               element=count,
                                                               ctype=ctype, val=val)
                         ev_txt += "\n"
-                    if con[0] in con_map.keys():
-                        for fconidx in con_map[con[0]]:
-                            ev_txt += contrast_ftest_element.substitute(
-                                cnum=ftest_idx.index(fconidx) + 1,
-                                element=tidx,
-                                ctype=ctype,
-                                val=1)
+                    # if con[0] in con_map.keys():
+                    #     for fconidx in con_map[con[0]]:
+                    #         ev_txt += contrast_ftest_element.substitute(
+                    #             cnum=ftest_idx.index(fconidx) + 1,
+                    #             element=tidx,
+                    #             ctype=ctype,
+                    #             val=1)
+                    for fconidx in ftest_idx:
+                        fval=0
+                        if con[0] in con_map.keys() and fconidx in con_map[con[0]]:
+                            fval=1
+                        ev_txt += contrast_ftest_element.substitute(
+                            cnum=ftest_idx.index(fconidx) + 1,
+                            element=tidx,
+                            ctype=ctype,
+                            val=fval)
                         ev_txt += "\n"
 
             # add contrast mask info