r19251 - /branches/relax_disp/specific_analyses/relax_disp.py -- March 27, 2013 - 15:45

Author: bugman
Date: Wed Mar 27 15:45:35 2013
New Revision: 19251

URL: http://svn.gna.org/viewcvs/relax?rev=19251&view=rev
Log:
Ported r8733 from the old relax_disp branch into the new branch.

The command used was:
svn merge -r8732:8733 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
 specific_analyses

.....
  r8733 | semor | 2009-02-04 17:26:10 +0100 (Wed, 04 Feb 2009) | 6 lines
  Changed paths:
     M /branches/relax_disp/specific_fns/relax_disp.py
  
  Fixed an import (as well as a few comments).
  
  This however introduces an error concerning the 'chi2' being undefined in 
the C module for
  relaxation dispersion...
.....


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py

Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19251&r1=19250&r2=19251&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 15:45:35 
2013
@@ -39,14 +39,14 @@
 
 # C modules.
 if C_module_exp_fn:
-    from maths_fns.relax_fit import setup, func, dfunc, d2func, back_calc_I
+    from maths_fns.relax_disp import setup, func, dfunc, d2func, back_calc_I
 
 
 class Relax_disp(Common_functions):
     """Class containing functions for relaxation dispersion curve fitting."""
 
     def assemble_param_vector(self, spin=None, sim_index=None):
-        """Assemble the dispersion relaxation dispersion curve-fitting 
parameter vector (as a numpy array).
+        """Assemble the dispersion relaxation dispersion curve fitting 
parameter vector (as a numpy array).
 
         @keyword spin:          The spin data container.
         @type spin:             SpinContainer instance
@@ -228,7 +228,7 @@
         # Create a scaling matrix.
         scaling_matrix = self.assemble_scaling_matrix(spin=spin, 
scaling=False)
 
-        # Initialise the relaxation fit functions.
+        # Initialise the relaxation dispersion fit functions.
         setup(num_params=len(spin.params), num_times=len(cdp.cpmg_frqs), 
values=spin.intensities, sd=spin.intensity_err, cpmg_frqs=cdp.cpmg_frqs, 
scaling_matrix=scaling_matrix)
 
         # Make a single function call.  This will cause back calculation and 
the data will be stored in the C module.