r15071 - /branches/frame_order_testing/specific_fns/frame_order.py -- December 08, 2011 - 17:18

Author: bugman
Date: Thu Dec  8 17:18:54 2011
New Revision: 15071

URL: http://svn.gna.org/viewcvs/relax?rev=15071&view=rev
Log:
The frame order analysis grid search points are now diagonally scaled.

This makes the grid search usable when the pivot point is also part of the 
parameter set.


Modified:
    branches/frame_order_testing/specific_fns/frame_order.py

Modified: branches/frame_order_testing/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/frame_order.py?rev=15071&r1=15070&r2=15071&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/frame_order.py (original)
+++ branches/frame_order_testing/specific_fns/frame_order.py Thu Dec  8 
17:18:54 2011
@@ -1575,6 +1575,9 @@
         if not hasattr(cdp, 'model'):
             raise RelaxNoModelError('Frame Order')
 
+        # Parameter scaling.
+        scaling_matrix = 
self._assemble_scaling_matrix(data_types=self._base_data_types(), 
scaling=True)
+
         # The number of parameters.
         n = self._param_num()
 
@@ -1683,11 +1686,11 @@
                 # Fixed parameter.
                 if grid[j] == None:
                     # Get the current parameter value.
-                    pts[i, j] = getattr(cdp, cdp.params[j])
+                    pts[i, j] = getattr(cdp, cdp.params[j]) / 
scaling_matrix[j, j]
 
                 # Add the point coordinate.
                 else:
-                    pts[i, j] = grid[j][indices[j]]
+                    pts[i, j] = grid[j][indices[j]] / scaling_matrix[j, j]
 
             # Increment the step positions.
             for j in range(n):