r19618 - in /branches/relax_disp: ./ specific_analyses/relax_fit.py -- May 02, 2013 - 14:20

Author: bugman
Date: Thu May  2 14:20:20 2013
New Revision: 19618

URL: http://svn.gna.org/viewcvs/relax?rev=19618&view=rev
Log:
Merged revisions 19617 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19617 | bugman | 2013-05-02 14:19:18 +0200 (Thu, 02 May 2013) | 5 lines
  
  The relax_fit analysis now uses lib.mathematics.round_to_next_order() for 
the scaling matrix.
  
  This allows the optimised I0 value to be better understandable in the 
printouts.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/specific_analyses/relax_fit.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May  2 14:20:20 2013
@@ -1,1 +1,1 @@
-/trunk:1-19615
+/trunk:1-19617

Modified: branches/relax_disp/specific_analyses/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_fit.py?rev=19618&r1=19617&r2=19618&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_fit.py (original)
+++ branches/relax_disp/specific_analyses/relax_fit.py Thu May  2 14:20:20 
2013
@@ -32,10 +32,11 @@
 
 # relax module imports.
 from dep_check import C_module_exp_fn
+from lib.errors import RelaxError, RelaxFuncSetupError, RelaxLenError, 
RelaxNoModelError, RelaxNoSequenceError
+from lib.mathematics import round_to_next_order
+from lib.warnings import RelaxDeselectWarning
 from pipe_control import pipes
 from pipe_control.mol_res_spin import exists_mol_res_spin_data, 
generate_spin_id_unique, return_spin, spin_loop
-from lib.errors import RelaxError, RelaxFuncSetupError, RelaxLenError, 
RelaxNoModelError, RelaxNoSequenceError
-from lib.warnings import RelaxDeselectWarning
 from specific_analyses.api_base import API_base
 from specific_analyses.api_common import API_common
 from user_functions.data import Uf_tables; uf_tables = Uf_tables()
@@ -153,7 +154,7 @@
 
             # Intensity scaling.
             elif search('^i', spin.params[i]):
-                scaling_matrix[i, i] = max(spin.intensities.values())
+                scaling_matrix[i, i] = 
round_to_next_order(max(spin.intensities.values()))
 
         # Return the scaling matrix.
         return scaling_matrix