r21620 - in /branches/relax_disp: specific_analyses/relax_disp/ target_functions/ user_functions/ -- November 24, 2013 - 15:10

Author: bugman
Date: Sun Nov 24 15:10:41 2013
New Revision: 21620

URL: http://svn.gna.org/viewcvs/relax?rev=21620&view=rev
Log:
The relax_disp.plot_disp_curves user function now produces interpolated 
dispersion curves.

For this the new 'num_points' and 'extend' arguments have been added to the 
user function to give
the user better control of this plotting.  The interpolated curve is disabled 
from the numeric CPMG
models as these do not support interpolation, and the 'R2eff' model as 
interpolation is not needed.

To support this, the 
specific_analyses.relax_disp.optimisation.back_calc_r2eff() function has been
extended to support the CPMG frequencies or spin-lock field strengths been 
supplied instead of
retrieved.  This allows a set of custom dispersion points to be used in the 
back calculation.

The dispersion target function setup was modified to prevent the 
recalculation of tau_CPMG values
when asked, as interpolation is not compatible with this.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/api.py
    branches/relax_disp/specific_analyses/relax_disp/disp_data.py
    branches/relax_disp/specific_analyses/relax_disp/optimisation.py
    branches/relax_disp/specific_analyses/relax_disp/variables.py
    branches/relax_disp/target_functions/relax_disp.py
    branches/relax_disp/user_functions/relax_disp.py

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/relax_disp/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/api.py?rev=21620&r1=21619&r2=21620&view=diff

Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=21620&r1=21619&r2=21620&view=diff

Modified: branches/relax_disp/specific_analyses/relax_disp/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/optimisation.py?rev=21620&r1=21619&r2=21620&view=diff

Modified: branches/relax_disp/specific_analyses/relax_disp/variables.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/variables.py?rev=21620&r1=21619&r2=21620&view=diff

Modified: branches/relax_disp/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/relax_disp.py?rev=21620&r1=21619&r2=21620&view=diff

Modified: branches/relax_disp/user_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/relax_disp.py?rev=21620&r1=21619&r2=21620&view=diff