Author: bugman Date: Mon Jun 30 10:16:57 2014 New Revision: 24361 URL: http://svn.gna.org/viewcvs/relax?rev=24361&view=rev Log: Added better epydoc sectioning to the lib.dispersion.ns_cpmg_2site_expanded module docstring. This is to better separate the original scripts used to document the code evolution. Modified: trunk/lib/dispersion/ns_cpmg_2site_expanded.py Modified: trunk/lib/dispersion/ns_cpmg_2site_expanded.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/ns_cpmg_2site_expanded.py?rev=24361&r1=24360&r2=24361&view=diff ============================================================================== --- trunk/lib/dispersion/ns_cpmg_2site_expanded.py (original) +++ trunk/lib/dispersion/ns_cpmg_2site_expanded.py Mon Jun 30 10:16:57 2014 @@ -46,6 +46,10 @@ - Mathilde Lescanne, U{http://article.gmane.org/gmane.science.nmr.relax.devel/4138}, - Dominique Marion, U{http://article.gmane.org/gmane.science.nmr.relax.devel/4157}. + +Code evolution +-------------- + The complex path of the code from the original Maple to relax can be described as: - p3.analytical (Maple input text file at U{https://gna.org/task/?7712#comment8}), @@ -53,6 +57,10 @@ - Manually converted to Matlab by Nikolai (sim_all.tar at U{https://gna.org/task/?7712#comment5}) - Manually converted to Python by Paul, Mathilde, and Dominique (fitting_main.py at U{https://gna.org/task/?7712#comment1}) - Converted into Python code for relax (here). + + +Maple p3.analytical script +-------------------------- For reference, the original Maple script written by Nikolai for the expansion of the equations is:: @@ -128,6 +136,9 @@ fortran([intensity=obs1, intensity_ref=obsref], optimized): + +Matlab sim_all.tar funNikolai.m script +-------------------------------------- Also for reference, the Matlab code from Nikolai and Martin manually converted from the automatically generated FORTRAN from the previous script into the funNikolai.m file is::