Author: bugman Date: Fri Sep 19 09:26:19 2014 New Revision: 25907 URL: http://svn.gna.org/viewcvs/relax?rev=25907&view=rev Log: Merged revisions 25900,25902-25904,25906 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r25900 | tlinnet | 2014-09-18 17:46:44 +0200 (Thu, 18 Sep 2014) | 3 lines Reordered functions in repeated analysis protocol. Task #7826 (https://gna.org/task/index.php?7826): Write an python class for the repeated analysis of dispersion data. ........ r25902 | tlinnet | 2014-09-18 18:04:46 +0200 (Thu, 18 Sep 2014) | 5 lines Added more check of methods to the systemtest Relax_disp.test_repeat_cpmg(). This actually shows, that user function relax_disp.r20_from_min_r2eff maybe is broken. Task #7826 (https://gna.org/task/index.php?7826): Write an python class for the repeated analysis of dispersion data. ........ r25903 | tlinnet | 2014-09-18 19:00:17 +0200 (Thu, 18 Sep 2014) | 3 lines Fix for the testing of method is finished when called. Task #7826 (https://gna.org/task/index.php?7826): Write an python class for the repeated analysis of dispersion data. ........ r25904 | tlinnet | 2014-09-18 19:00:19 +0200 (Thu, 18 Sep 2014) | 3 lines Turned on minimisation in systemtest Relax_disp.test_repeat_cpmg(). Task #7826 (https://gna.org/task/index.php?7826): Write an python class for the repeated analysis of dispersion data. ........ r25906 | bugman | 2014-09-19 09:13:03 +0200 (Fri, 19 Sep 2014) | 9 lines The lib.spectrum.nmrpipe has been made independent of the relax source code. This was discussed at http://thread.gmane.org/gmane.science.nmr.relax.scm/23357/focus=7103. The change allows the software verification tests pass. The dep_check module cannot be used in the relax lib package. Only modules from within lib are allowed to be imported into modules of lib. The fix now allows the full test suite to pass and hence new relax releases are once again possible. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py branches/frame_order_cleanup/lib/spectrum/nmrpipe.py branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py?rev=25907&r1=25906&r2=25907&view=diff Modified: branches/frame_order_cleanup/lib/spectrum/nmrpipe.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/spectrum/nmrpipe.py?rev=25907&r1=25906&r2=25907&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py?rev=25907&r1=25906&r2=25907&view=diff