r19962 - in /branches/relax_disp: ./ pipe_control/value.py -- June 07, 2013 - 23:57

Author: bugman
Date: Fri Jun  7 23:57:38 2013
New Revision: 19962

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

........
  r19961 | bugman | 2013-06-07 23:57:07 +0200 (Fri, 07 Jun 2013) | 6 lines
  
  Fixes for the value.write user function for simple parameter values of None.
  
  This is a recently introduced bug which causes a complete failure of the 
user function is the
  parameter for any spin is None.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/pipe_control/value.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun  7 23:57:38 2013
@@ -1,1 +1,1 @@
-/trunk:1-19947
+/trunk:1-19961

Modified: branches/relax_disp/pipe_control/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/value.py?rev=19962&r1=19961&r2=19962&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/value.py (original)
+++ branches/relax_disp/pipe_control/value.py Fri Jun  7 23:57:38 2013
@@ -608,7 +608,7 @@
         spin_names.append(spin.name)
 
         # Dictionary type data.
-        if isinstance(value, dict):
+        if data_type == 'dict':
             # Initialise the lists.
             values.append([])
             errors.append([])
@@ -626,7 +626,7 @@
                     errors[-1].append(scale(error[key], scaling))
 
         # List type data.
-        elif isinstance(value, list):
+        elif data_type == 'list':
             # Initialise the lists.
             values.append([])
             errors.append([])
@@ -643,17 +643,6 @@
                 else:
                     errors[-1].append(scale(error[i], scaling))
 
-        # None.
-        elif value == None:
-            # Initialise the lists.
-            values.append([])
-            errors.append([])
-
-            # Loop over the data.
-            for i in range(len(data_names)):
-                values[-1].append(None)
-                errors[-1].append(None)
-
         # Simple values.
         else:
             # Append the scaled values and errors.