r9551 - /1.3/specific_fns/frame_order.py -- September 21, 2009 - 20:25

Author: bugman
Date: Mon Sep 21 20:25:52 2009
New Revision: 9551

URL: http://svn.gna.org/viewcvs/relax?rev=9551&view=rev
Log:
Fix for the __unpack_opt_results() for the new direct calling of the grid 
search.

The returned results are different.


Modified:
    1.3/specific_fns/frame_order.py

Modified: 1.3/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/frame_order.py?rev=9551&r1=9550&r2=9551&view=diff
==============================================================================
--- 1.3/specific_fns/frame_order.py (original)
+++ 1.3/specific_fns/frame_order.py Mon Sep 21 20:25:52 2009
@@ -247,7 +247,14 @@
          """
 
         # Disassemble the results.
-        param_vector, func, iter_count, f_count, g_count, h_count, warning = 
results
+        if len(results) == 3:    # Grid search.
+            param_vector, func, iter_count = results
+            f_count = iter_count
+            g_count = 0.0
+            h_count = 0.0
+            warning = None
+        else:
+            param_vector, func, iter_count, f_count, g_count, h_count, 
warning = results
 
         # Catch infinite chi-squared values.
         if isInf(func):