r5181 - in /1.3/specific_fns/model_free: mf_minimise.py model_free.py -- March 23, 2008 - 13:46

Author: bugman
Date: Sun Mar 23 13:46:58 2008
New Revision: 5181

URL: http://svn.gna.org/viewcvs/relax?rev=5181&view=rev
Log:
The param_set variable is now passed into assemble_scaling_matrix().


Modified:
    1.3/specific_fns/model_free/mf_minimise.py
    1.3/specific_fns/model_free/model_free.py

Modified: 1.3/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=5181&r1=5180&r2=5181&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sun Mar 23 13:46:58 2008
@@ -856,7 +856,7 @@
                 param_vector = self.assemble_param_vector(spin=spin, 
sim_index=sim_index)
 
                 # Diagonal scaling.
-                scaling_matrix = 
self.assemble_scaling_matrix(len(param_vector), spin=spin, scaling=scaling)
+                scaling_matrix = 
self.assemble_scaling_matrix(len(param_vector), param_set=param_set, 
spin=spin, scaling=scaling)
                 if scaling_matrix:
                     param_vector = dot(inv(scaling_matrix), param_vector)
 

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=5181&r1=5180&r2=5181&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/model_free.py (original)
+++ 1.3/specific_fns/model_free/model_free.py Sun Mar 23 13:46:58 2008
@@ -317,13 +317,15 @@
         return array(param_vector, float64)
 
 
-    def assemble_scaling_matrix(self, num_params, spin=None, spin_id=None, 
scaling=True):
+    def assemble_scaling_matrix(self, num_params, param_set=None, spin=None, 
spin_id=None, scaling=True):
         """Create and return the scaling matrix.
 
         If the spin argument is supplied, then the spin_id argument will be 
ignored.
 
         @param num_params:      The number of parameters in the model.
         @type num_params:       int
+        @keyword param_set:     The parameter set, one of 'all', 'diff', 
'mf', or 'local_tm'.
+        @type param_set:        str
         @keyword spin:          The spin data container.
         @type spin:             SpinContainer instance
         @keyword spin_id:       The spin identification string.
@@ -347,7 +349,7 @@
         ti_scaling = 1e-12
 
         # Diffusion tensor parameters.
-        if self.param_set == 'diff' or self.param_set == 'all':
+        if param_set == 'diff' or param_set == 'all':
             # Spherical diffusion.
             if cdp.diff_tensor.type == 'sphere':
                 # tm.
@@ -381,7 +383,7 @@
                 i = i + 6
 
         # Model-free parameters.
-        if self.param_set != 'diff':
+        if param_set != 'diff':
             # The loop.
             if spin:
                 loop = [spin]