r5136 - /1.3/specific_fns/model_free/model_free.py -- March 22, 2008 - 15:46

Author: bugman
Date: Sat Mar 22 15:12:47 2008
New Revision: 5136

URL: http://svn.gna.org/viewcvs/relax?rev=5136&view=rev
Log:
assemble_param_vector() now calls determine_param_set_type() to get the model 
type.


Modified:
    1.3/specific_fns/model_free/model_free.py

Modified: 1.3/specific_fns/model_free/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/model_free.py?rev=5136&r1=5135&r2=5136&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/model_free.py (original)
+++ 1.3/specific_fns/model_free/model_free.py Sat Mar 22 15:12:47 2008
@@ -150,12 +150,9 @@
                 param_names = param_names + spin.params
 
 
-    def assemble_param_vector(self, model_type, spin_id=None, 
sim_index=None):
+    def assemble_param_vector(self, spin_id=None, sim_index=None):
         """Assemble the model-free parameter vector (as numpy array).
 
-        @param model_type:  The model-free model type.  This must be one of 
'mf', 'local_tm',
-                            'diff', or 'all'.
-        @type model_type:   str
         @param spin_id:     The spin identification string.
         @type spin_id:      str
         @return:            An array of the parameter values of the 
model-free model.
@@ -164,6 +161,9 @@
 
         # Initialise.
         param_vector = []
+
+        # Determine the model type.
+        model_type = self.determine_param_set_type()
 
         # Alias the current data pipe.
         cdp = relax_data_store[relax_data_store.current_pipe]