added back the fstat outputs to fsl flameo interface

Conflicts:

	nipype/interfaces/fsl/model.py

Author: ranjit

nipype/interfaces/fsl/model.py

@@ -678,6 +678,8 @@ class FLAMEOOutputSpec(TraitedSpec):
         exists=True, desc="Variance estimates for each contrast")
     zstats = OutputMultiPath(exists=True, desc="z-stat file for each contrast")
     tstats = OutputMultiPath(exists=True, desc="t-stat file for each contrast")
+    zfstats = OutputMultiPath(exists=True, desc="z stat file for each f contrast")         
+    fstats = OutputMultiPath(exists=True, desc="f-stat file for each contrast")
     mrefvars = OutputMultiPath(
         exists=True, desc="mean random effect variances for each contrast")
     tdof = OutputMultiPath(
@@ -752,6 +754,16 @@ def _list_outputs(self):
         zstats = glob(os.path.join(pth, 'zstat[0-9]*.*'))
         assert len(zstats) >= 1, 'No zstat volumes generated by FSL CEstimate'
         outputs['zstats'] = zstats
+        
+            
+        if isdefined(self.inputs.f_con_file):
+            zfstats = glob(os.path.join(pth, 'zfstat[0-9]*.*'))
+            assert len(zfstats) >= 1, 'No zfstat volumes generated by FSL CEstimate'
+            outputs['zfstats'] = zfstats          
+             
+            fstats = glob(os.path.join(pth, 'fstat[0-9]*.*'))          
+            assert len(fstats) >= 1, 'No fstat volumes generated by FSL CEstimate'
+            outputs['fstats'] = fstats
 
         tstats = glob(os.path.join(pth, 'tstat[0-9]*.*'))
         assert len(tstats) >= 1, 'No tstat volumes generated by FSL CEstimate'