r10833 - /branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py -- February 23, 2010 - 00:39

Author: bugman
Date: Tue Feb 23 00:39:53 2010
New Revision: 10833

URL: http://svn.gna.org/viewcvs/relax?rev=10833&view=rev
Log:
Fix for the _disassemble_result() method for when there is no chi2 variable 
present.


Modified:
    branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py

Modified: 
branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py?rev=10833&r1=10832&r2=10833&view=diff
==============================================================================
--- branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py 
(original)
+++ branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py Tue 
Feb 23 00:39:53 2010
@@ -340,9 +340,10 @@
         # Check if the chi-squared value is lower.  This allows for a 
parallelised grid search!
         if sim_index == None:
             # Get the correct value.
-            if model_type == 'mf' or model_type == 'local_tm':
+            chi2 = None
+            if (model_type == 'mf' or model_type == 'local_tm') and 
hasattr(cdp, 'chi2'):
                 chi2 = spin.chi2
-            elif model_type == 'diff' or model_type == 'all':
+            if (model_type == 'diff' or model_type == 'all') and 
hasattr(cdp, 'chi2'):
                 chi2 = cdp.chi2
 
             # No improvement.