r5643 - /1.3/specific_fns/model_free/model_free.py -- April 13, 2008 - 20:02

Author: bugman
Date: Sun Apr 13 20:02:52 2008
New Revision: 5643

URL: http://svn.gna.org/viewcvs/relax?rev=5643&view=rev
Log:
Modified the assemble_param_vector() method to allow the parameter set to be 
given as an arg.


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=5643&r1=5642&r2=5643&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/model_free.py (original)
+++ 1.3/specific_fns/model_free/model_free.py Sun Apr 13 20:02:52 2008
@@ -155,26 +155,30 @@
                 param_names = param_names + spin.params
 
 
-    def assemble_param_vector(self, spin=None, spin_id=None, sim_index=None):
+    def assemble_param_vector(self, spin=None, spin_id=None, sim_index=None, 
model_type=None):
         """Assemble the model-free parameter vector (as numpy array).
 
         If the spin argument is supplied, then the spin_id argument will be 
ignored.
 
-        @keyword spin:      The spin data container.
-        @type spin:         SpinContainer instance
-        @keyword spin_id:   The spin identification string.
-        @type spin_id:      str
-        @keyword sim_index: The optional MC simulation index.
-        @type sim_index:    int
-        @return:            An array of the parameter values of the 
model-free model.
-        @rtype:             numpy array
+        @keyword spin:          The spin data container.
+        @type spin:             SpinContainer instance
+        @keyword spin_id:       The spin identification string.
+        @type spin_id:          str
+        @keyword sim_index:     The optional MC simulation index.
+        @type sim_index:        int
+        @keyword model_type:    The optional parameter set, one of 'all', 
'diff', 'mf', or
+                                'local_tm'. 
+        @type model_type:       str or None
+        @return:                An array of the parameter values of the 
model-free model.
+        @rtype:                 numpy array
         """
 
         # Initialise.
         param_vector = []
 
         # Determine the model type.
-        model_type = self.determine_param_set_type()
+        if not model_type:
+            model_type = self.determine_param_set_type()
 
         # Alias the current data pipe.
         cdp = relax_data_store[relax_data_store.current_pipe]