r6205 - /1.3/specific_fns/relax_fit.py -- May 21, 2008 - 22:49

Author: bugman
Date: Wed May 21 22:49:31 2008
New Revision: 6205

URL: http://svn.gna.org/viewcvs/relax?rev=6205&view=rev
Log:
Updated the disassemble_param_vector() method to the new design.


Modified:
    1.3/specific_fns/relax_fit.py

Modified: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=6205&r1=6204&r2=6205&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Wed May 21 22:49:31 2008
@@ -347,35 +347,43 @@
             return 0.0
 
 
-    def disassemble_param_vector(self, index=None, sim_index=None):
-        """Function for disassembling the parameter vector."""
-
-        # Alias the residue specific data structure.
-        data = relax_data_store.res[self.run][index]
+    def disassemble_param_vector(self, param_vector=None, spin=None, 
sim_index=None):
+        """Disassemble the parameter vector.
+
+        @keyword param_vector:  The parameter vector.
+        @type param_vector:     numpy array
+        @keyword spin:          The spin data container.
+        @type spin:             SpinContainer instance
+        @keyword sim_index:     The optional MC simulation index.
+        @type sim_index:        int
+        """
+
+        # Alias the current data pipe.
+        cdp = relax_data_store[relax_data_store.current_pipe]
 
         # Monte Carlo simulations.
         if sim_index != None:
             # The relaxation rate.
-            data.rx_sim[sim_index] = self.param_vector[0]
+            spin.rx_sim[sim_index] = param_vector[0]
 
             # Initial intensity.
-            data.i0_sim[sim_index] = self.param_vector[1]
+            spin.i0_sim[sim_index] = param_vector[1]
 
             # Intensity at infinity.
-            if relax_data_store.curve_type[self.run] == 'inv':
-                data.iinf_sim[sim_index] = self.param_vector[2]
+            if cdp.curve_type == 'inv':
+                spin.iinf_sim[sim_index] = param_vector[2]
 
         # Parameter values.
         else:
             # The relaxation rate.
-            data.rx = self.param_vector[0]
+            spin.rx = param_vector[0]
 
             # Initial intensity.
-            data.i0 = self.param_vector[1]
+            spin.i0 = param_vector[1]
 
             # Intensity at infinity.
-            if relax_data_store.curve_type[self.run] == 'inv':
-                data.iinf = self.param_vector[2]
+            if cdp.curve_type == 'inv':
+                spin.iinf = param_vector[2]
 
 
     def grid_search(self, lower=None, upper=None, inc=None, 
constraints=True, verbosity=1, sim_index=None):