r11703 - /branches/bieri_gui/gui_bieri/analyses/auto_model_free.py -- December 06, 2010 - 06:47

Author: michaelbieri
Date: Mon Dec  6 06:47:00 2010
New Revision: 11703

URL: http://svn.gna.org/viewcvs/relax?rev=11703&view=rev
Log:
Parameter file is only handed over to relax core if loaded.

Modified:
    branches/bieri_gui/gui_bieri/analyses/auto_model_free.py

Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_model_free.py?rev=11703&r1=11702&r2=11703&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Mon Dec  6 
06:47:00 2010
@@ -613,10 +613,13 @@
             if frq == '':
                 continue
 
-            # Append the relaxation data.
-            data.relax_data.append(['R1', str(frq), float(frq)*1e6, 
files[1], None, None, param_tmp[1], param_tmp[2], param_tmp[3], param_tmp[4], 
param_tmp[5], param_tmp[6], None])
-            data.relax_data.append(['R2', str(frq), float(frq)*1e6, 
files[2], None, None, param_tmp[1], param_tmp[2], param_tmp[3], param_tmp[4], 
param_tmp[5], param_tmp[6], None])
-            data.relax_data.append(['NOE', str(frq), float(frq)*1e6, 
files[0], None, None, param_tmp[1], param_tmp[2], param_tmp[3], param_tmp[4], 
param_tmp[5], param_tmp[6], None])
+            # Append the relaxation data if present.
+            if not files[1] == '':
+                data.relax_data.append(['R1', str(frq), float(frq)*1e6, 
files[1], None, None, param_tmp[1], param_tmp[2], param_tmp[3], param_tmp[4], 
param_tmp[5], param_tmp[6], None])
+            if not files[2] == '':
+                data.relax_data.append(['R2', str(frq), float(frq)*1e6, 
files[2], None, None, param_tmp[1], param_tmp[2], param_tmp[3], param_tmp[4], 
param_tmp[5], param_tmp[6], None])
+            if not files[0] == '':
+                data.relax_data.append(['NOE', str(frq), float(frq)*1e6, 
files[0], None, None, param_tmp[1], param_tmp[2], param_tmp[3], param_tmp[4], 
param_tmp[5], param_tmp[6], None])
 
         # Unresolved resiudes
         file = DummyFileObject()