r15256 - /1.3/generic_fns/dasha.py -- January 26, 2012 - 10:43

Author: bugman
Date: Thu Jan 26 10:43:07 2012
New Revision: 15256

URL: http://svn.gna.org/viewcvs/relax?rev=15256&view=rev
Log:
Fixes for the Dasha use functions for file creation and data extraction.

This should now handle relaxation data values of None, and also set the 
parameter values of
deselected spins using the Dasha output files.


Modified:
    1.3/generic_fns/dasha.py

Modified: 1.3/generic_fns/dasha.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/dasha.py?rev=15256&r1=15255&r2=15256&view=diff
==============================================================================
--- 1.3/generic_fns/dasha.py (original)
+++ 1.3/generic_fns/dasha.py Thu Jan 26 10:43:07 2012
@@ -254,7 +254,7 @@
                 continue
 
             # Skip and deselect spins for which relaxation data is missing.
-            if len(spin.ri_data) != len(cdp.ri_ids):
+            if len(spin.ri_data) != len(cdp.ri_ids) or spin.ri_data[ri_id] 
== None:
                 spin.select = False
                 continue
 
@@ -479,12 +479,8 @@
         # Set the values.
         value.read(param=param, scaling=scaling, file=file_name, 
res_num_col=1, res_name_col=None, data_col=2, error_col=3)
 
-        # Clean up of non-existant parameters (set the parameter to None!).
+        # Clean up of non-existent parameters (set the parameter to None!).
         for spin in spin_loop():
-            # Skip deselected spins.
-            if not spin.select:
-                continue
-
             # Skip the spin (don't set the parameter to None) if the 
parameter exists in the model.
             if param in spin.params:
                 continue