r20740 - in /branches/relax_disp: ./ specific_analyses/model_free/mf_minimise.py -- September 02, 2013 - 11:30

Author: bugman
Date: Mon Sep  2 11:30:34 2013
New Revision: 20740

URL: http://svn.gna.org/viewcvs/relax?rev=20740&view=rev
Log:
Merged revisions 20738 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20738 | bugman | 2013-09-02 11:18:33 +0200 (Mon, 02 Sep 2013) | 7 lines
  
  The model-free optimisation code now handles minfx returning nothing.
  
  This is due to the fix of bug #21001 (https://gna.org/bugs/?21001) in 
relax, which is really a fix
  for an upstream minfx (https://gna.org/projects/minfx/) bug (bug #21090 at
  https://gna.org/bugs/?21090).
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/specific_analyses/model_free/mf_minimise.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep  2 11:30:34 2013
@@ -1,1 +1,1 @@
-/trunk:1-20684,20737
+/trunk:1-20739

Modified: branches/relax_disp/specific_analyses/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/model_free/mf_minimise.py?rev=20740&r1=20739&r2=20740&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/model_free/mf_minimise.py (original)
+++ branches/relax_disp/specific_analyses/model_free/mf_minimise.py Mon Sep  
2 11:30:34 2013
@@ -322,6 +322,10 @@
         @keyword scaling_matrix:    The diagonal, square scaling matrix.
         @type scaling_matrix:       numpy diagonal matrix
         """
+
+        # No result.
+        if param_vector == None:
+            return
 
         # Alias the current data pipe.
         cdp = pipes.get_pipe()