r6443 - /1.3/specific_fns/model_free/main.py -- June 22, 2008 - 21:08

Author: bugman
Date: Sun Jun 22 20:48:06 2008
New Revision: 6443

URL: http://svn.gna.org/viewcvs/relax?rev=6443&view=rev
Log:
Updated the data_names() and data_init() methods to include more of the 
model-free data pipe objects.


Modified:
    1.3/specific_fns/model_free/main.py

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=6443&r1=6442&r2=6443&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Sun Jun 22 20:48:06 2008
@@ -621,28 +621,8 @@
             if name in list_data:
                 init_data = []
 
-            # Data structures which are initially None.
-            none_data = [ 'equation',
-                          'model',
-                          's2',
-                          's2f',
-                          's2s',
-                          'local_tm',
-                          'te',
-                          'tf',
-                          'ts',
-                          'rex',
-                          'r',
-                          'csa',
-                          'nucleus',
-                          'chi2',
-                          'iter',
-                          'f_count',
-                          'g_count',
-                          'h_count',
-                          'warning' ]
-            if name in none_data:
-                init_data = None
+            # Set everything else initially to None.
+            init_data = None
 
             # If the name is not in 'spin', add it.
             if not hasattr(spin, name):
@@ -703,6 +683,12 @@
 
         # Generic.
         if set == 'all' or set == 'generic':
+            names.append('select')
+            names.append('fixed')
+            names.append('proton_type')
+            names.append('heteronuc_type')
+            names.append('attached_proton')
+            names.append('nucleus')
             names.append('model')
             names.append('equation')
             names.append('params')
@@ -719,7 +705,6 @@
             names.append('rex')
             names.append('r')
             names.append('csa')
-            names.append('nucleus')
 
         # Minimisation statistics.
         if set == 'all' or set == 'min':
@@ -730,6 +715,10 @@
             names.append('h_count')
             names.append('warning')
 
+        # Structural data.
+        names.append('xh_vect')
+
+        # Return the names.
         return names