The new fastfit takes a specific seed model output, ext_tofts in our …

…case.
ohsu-qin · Jun 9, 2017 · 37e4f1d · 37e4f1d
1 parent c821ac9
commit 37e4f1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/qipipe/conf/modeling.cfg b/qipipe/conf/modeling.cfg
@@ -9,9 +9,9 @@
 plugin_args = {'qsub_args': '-l h_rt=00:30:00,mf=16G'}
 
 [Fastfit]
-plugin_args = {'qsub_args': '-pe mpi 24-48 -l h_rt=08:00:00,mf=750M,h_vmem=2G', 'overwrite': True}
+plugin_args = {'qsub_args': '-pe mpi 12-24 -l h_rt=48:00:00,mf=500M,h_vmem=4G', 'overwrite': True}
 model_name = 'baldero.full'
-optional_outs = ['chisq', 'guess_model.k_trans', 'guess_model.v_e', 'guess_model.chisq']
+optional_outs = ['chisq', 'ext_tofts.k_trans', 'ext_tofts.v_e', 'ext_tofts.chisq']
 
 [create_profile]
 plugin_args = {'qsub_args': '-l h_rt=00:05:00,mf=1G', 'overwrite': True}

diff --git a/qipipe/pipeline/modeling.py b/qipipe/pipeline/modeling.py
@@ -560,7 +560,7 @@ def _create_bolero_workflow(self, **opts):
         delta_k_trans = pe.Node(fsl.ImageMaths(), name='delta_k_trans')
         delta_k_trans.inputs.op_string = '-sub'
         workflow.connect(pk_map, 'k_trans', delta_k_trans, 'in_file')
-        workflow.connect(pk_map, 'guess_model.k_trans',
+        workflow.connect(pk_map, 'ext_tofts.k_trans',
                          delta_k_trans, 'in_file2')
 
         # The modeling outputs.
@@ -573,10 +573,10 @@ def _create_bolero_workflow(self, **opts):
         workflow.connect(pk_map, 'v_e', output_spec, 'fxr_v_e')
         workflow.connect(pk_map, 'tau_i', output_spec, 'fxr_tau_i')
         workflow.connect(pk_map, 'chisq', output_spec, 'fxr_chisq')
-        workflow.connect(pk_map, 'guess_model.k_trans',
+        workflow.connect(pk_map, 'ext_tofts.k_trans',
                          output_spec, 'fxl_k_trans')
-        workflow.connect(pk_map, 'guess_model.v_e', output_spec, 'fxl_v_e')
-        workflow.connect(pk_map, 'guess_model.chisq', output_spec, 'fxl_chisq')
+        workflow.connect(pk_map, 'ext_tofts.v_e', output_spec, 'fxl_v_e')
+        workflow.connect(pk_map, 'ext_tofts.chisq', output_spec, 'fxl_chisq')
         workflow.connect(delta_k_trans, 'out_file',
                          output_spec, 'delta_k_trans')