Author: bugman
Date: Wed Sep 3 18:58:09 2014
New Revision: 25595
URL: http://svn.gna.org/viewcvs/relax?rev=25595&view=rev
Log:
Removed svnmerge lines from the r1rho_plotting branch commit messages.
Modified:
tags/3.3.0/docs/CHANGES
Modified: tags/3.3.0/docs/CHANGES
URL:
http://svn.gna.org/viewcvs/relax/tags/3.3.0/docs/CHANGES?rev=25595&r1=25594&r2=25595&view=diff
==============================================================================
--- tags/3.3.0/docs/CHANGES (original)
+++ tags/3.3.0/docs/CHANGES Wed Sep 3 18:58:09 2014
@@ -642,8 +642,6 @@
* Initialized merge tracking via "svnmerge" with revisions "1-24672"
from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/r1rho_plotting
- * This branch is created for the Support Request: sr
#3124(https://gna.org/support/?3124): Grace graphs production for R1rho
analysis with R2_eff as function of Omega_eff.
- * Initialized merge tracking via "svnmerge" with revisions "1-24671"
from svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk
* Split out the interpolating in
specific_analyses.relax_disp.data.plot_disp_curves() into separate function.
This is to prepare for a interpolating function for spin-lock offset rather
than spin-lock field strength for R1rho models. sr
#3124(https://gna.org/support/?3124): Grace graphs production for R1rho
analysis with R2_eff as function of Omega_eff. sr
#3138(https://gna.org/support/?3138): Interpolating theta through spin-lock
offset [Omega], rather than spin-lock field strength [w1].
* Split out the looping over frequency and offset into its own
function, in function of
specific_analysis.relax_disp.data.plot_disp_curves(). sr
#3124(https://gna.org/support/?3124): Grace graphs production for R1rho
analysis with R2_eff as function of Omega_eff. sr
#3138(https://gna.org/support/?3138): Interpolating theta through spin-lock
offset [Omega], rather than spin-lock field strength [w1].
* Split out the writing of dispersion graph files in
specific_analyses.relax_disp.data.plot_disp_curves(). This is to prepare for
a stand-alone function to plot R1rho graphs, interpolating theta through
spin-lock offset rather than spin-lock field strength. sr
#3124(https://gna.org/support/?3124): Grace graphs production for R1rho
analysis with R2_eff as function of Omega_eff. sr
#3138(https://gna.org/support/?3138): Interpolating theta through spin-lock
offset [Omega], rather than spin-lock field strength [w1].
@@ -727,7 +725,6 @@
* Added systemtest
Relax_disp.test_kteilum_fmpoulsen_makke_check_graphs to check all CPMG graph
combinations of: y_axis_types = [Y_AXIS_R2_EFF, Y_AXIS_R2_R1RHO]
x_axis_types = [X_AXIS_DISP, X_AXIS_THETA, X_AXIS_W_EFF] interpolate_types =
[INTERPOLATE_DISP] This is a total of 6 graphs. The graphs will in most
cases be totally equal, since the theta angle is calculated to 90 degrees,
and R1 is returned as 0.0, then R2=(R1rho - R1 cos^2(theta)) / sin^2(theta) =
R1rho = R2eff for CPMG models. sr #3124(https://gna.org/support/?3124):
Grace graphs production for R1rho analysis with R2_eff as function of
Omega_eff. sr #3138(https://gna.org/support/?3138): Interpolating theta
through spin-lock offset [Omega], rather than spin-lock field strength [w1].
* Added graphs to check against for system test:
Relax_disp.test_kteilum_fmpoulsen_makke_check_graphs. sr
#3124(https://gna.org/support/?3124): Grace graphs production for R1rho
analysis with R2_eff as function of Omega_eff. sr
#3138(https://gna.org/support/?3138): Interpolating theta through spin-lock
offset [Omega], rather than spin-lock field strength [w1].
* Expanded ex. to example in help text for function. sr
#3124(https://gna.org/support/?3124): Grace graphs production for R1rho
analysis with R2_eff as function of Omega_eff. sr
#3138(https://gna.org/support/?3138): Interpolating theta through spin-lock
offset [Omega], rather than spin-lock field strength [w1].
- * Merged revisions
24679,24684-24685,24702-24704,24707,24714,24718,24720,24722-24723,24725,24727,24729,24736-24737,24739-24743,24751-24752,24755-24757,24788,24796-24797,24837,24841,24843,24857,24866,24873-24875,24880-24883
via svnmerge from svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk
* Deleted unused comment line. sr
#3124(https://gna.org/support/?3124): Grace graphs production for R1rho
analysis with R2_eff as function of Omega_eff. sr
#3138(https://gna.org/support/?3138): Interpolating theta through spin-lock
offset [Omega], rather than spin-lock field strength [w1].
* Fix for unit test, where return_offset() function return has been
expanded and re-ordered. sr #3124(https://gna.org/support/?3124): Grace
graphs production for R1rho analysis with R2_eff as function of Omega_eff. sr
#3138(https://gna.org/support/?3138): Interpolating theta through spin-lock
offset [Omega], rather than spin-lock field strength [w1].
* Removed merge tracking for "svnmerge" for
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/r1rho_plotting
r25595 - /tags/3.3.0/docs/CHANGES