Author: bugman Date: Wed Mar 27 14:33:37 2013 New Revision: 19218 URL: http://svn.gna.org/viewcvs/relax?rev=19218&view=rev Log: Ported r8417 from the old relax_disp branch into the new branch. The command used was: svn merge -r8416:8417 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses ..... r8417 | semor | 2009-01-12 14:42:33 +0100 (Mon, 12 Jan 2009) | 5 lines Changed paths: M /branches/relax_disp/specific_fns/relax_disp.py Made a few corrections proposed by Ed in a post at: https://mail.gna.org/public/relax-devel/2009-01/msg00066.html (Message-id: <7f080ed10901120532h736892bbmd03483b4decadf39@xxxxxxxxxxxxxx>) ..... 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=19218&r1=19217&r2=19218&view=diff ============================================================================== --- branches/relax_disp/specific_analyses/relax_disp.py (original) +++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 14:33:37 2013 @@ -246,7 +246,7 @@ """ # Test if the current data pipe exists. - pipes.test + pipes.test() # Alias the current data pipe. cdp = pipes.get_pipe() @@ -266,7 +266,7 @@ # Make sure the experiment type is set to 'cpmg'. if not cdp.exp_type == 'cpmg': - raise RelaxError, "To use the function cpmg_delay(), the experiment type must be set to 'cpmg'." + raise RelaxError, "To use this user function, the experiment type must be set to 'cpmg'." # Test the CPMG constant time delay (T) has not already been set. if cdp.delayT.has_key(id): @@ -540,7 +540,7 @@ """ # Test if the current pipe exists. - pipes.test + pipes.test() # Get the current data pipe. cdp = pipes.get_pipe()