r27964 - /trunk/specific_analyses/frame_order/parameters.py -- October 02, 2015 - 16:14

Author: bugman
Date: Fri Oct  2 16:14:38 2015
New Revision: 27964

URL: http://svn.gna.org/viewcvs/relax?rev=27964&view=rev
Log:
Fix for the merger of the frame_order_cleanup branch.

The assemble_scaling_matrix() function of the 
specific_analyses.frame_order.parameters module was
deleted in the branch, but somehow survived the merge process.


Modified:
    trunk/specific_analyses/frame_order/parameters.py

Modified: trunk/specific_analyses/frame_order/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/parameters.py?rev=27964&r1=27963&r2=27964&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order/parameters.py   (original)
+++ trunk/specific_analyses/frame_order/parameters.py   Fri Oct  2 16:14:38 
2015
@@ -76,26 +76,6 @@
 
     # Return as a numpy array.
     return array(param_vect, float64)
-
-
-def assemble_scaling_matrix(scaling=True):
-    """Create and return the scaling matrix.
-
-    @keyword scaling:       If False, then the identity matrix will be 
returned.
-    @type scaling:          bool
-    @return:                The square and diagonal scaling matrix.
-    @rtype:                 numpy rank-2 array
-    """
-
-    # Initialise.
-    scaling_matrix = identity(param_num(), float64)
-
-    # Return the identity matrix.
-    if not scaling:
-        return scaling_matrix
-
-    # Return the matrix.
-    return scaling_matrix
 
 
 def linear_constraints(scaling_matrix=None):