r22681 - in /trunk/specific_analyses/frame_order: api.py optimisation.py parameters.py -- April 10, 2014 - 16:18

Author: bugman
Date: Thu Apr 10 16:18:35 2014
New Revision: 22681

URL: http://svn.gna.org/viewcvs/relax?rev=22681&view=rev
Log:
Simplified the assemble_scaling_matrix() frame order function.

The data_type argument no longer does anything, so has been eliminated.


Modified:
    trunk/specific_analyses/frame_order/api.py
    trunk/specific_analyses/frame_order/optimisation.py
    trunk/specific_analyses/frame_order/parameters.py

Modified: trunk/specific_analyses/frame_order/api.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/api.py?rev=22681&r1=22680&r2=22681&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order/api.py  (original)
+++ trunk/specific_analyses/frame_order/api.py  Thu Apr 10 16:18:35 2014
@@ -351,7 +351,7 @@
             raise RelaxNoModelError('Frame Order')
 
         # Parameter scaling.
-        scaling_matrix = 
assemble_scaling_matrix(data_types=base_data_types(), scaling=True)
+        scaling_matrix = assemble_scaling_matrix(scaling=True)
 
         # The number of parameters.
         n = param_num()

Modified: trunk/specific_analyses/frame_order/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/optimisation.py?rev=22681&r1=22680&r2=22681&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order/optimisation.py (original)
+++ trunk/specific_analyses/frame_order/optimisation.py Thu Apr 10 16:18:35 
2014
@@ -630,7 +630,7 @@
     # Diagonal scaling.
     scaling_matrix = None
     if len(param_vector):
-        scaling_matrix = assemble_scaling_matrix(data_types=data_types, 
scaling=scaling)
+        scaling_matrix = assemble_scaling_matrix(scaling=scaling)
         param_vector = dot(inv(scaling_matrix), param_vector)
 
     # Get the data structures for optimisation using the tensors as base 
data sets.

Modified: trunk/specific_analyses/frame_order/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/parameters.py?rev=22681&r1=22680&r2=22681&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order/parameters.py   (original)
+++ trunk/specific_analyses/frame_order/parameters.py   Thu Apr 10 16:18:35 
2014
@@ -61,11 +61,9 @@
     return array(param_vect, float64)
 
 
-def assemble_scaling_matrix(data_types=None, scaling=True):
+def assemble_scaling_matrix(scaling=True):
     """Create and return the scaling matrix.
 
-    @keyword data_types:    The base data types used in the optimisation.  
This list can contain the elements 'rdc', 'pcs' or 'tensor'.
-    @type data_types:       list of str
     @keyword scaling:       If False, then the identity matrix will be 
returned.
     @type scaling:          bool
     @return:                The square and diagonal scaling matrix.