r8347 - /branches/relax_disp/prompt/relax_disp.py -- January 08, 2009 - 21:18

Author: semor
Date: Thu Jan  8 21:18:09 2009
New Revision: 8347

URL: http://svn.gna.org/viewcvs/relax?rev=8347&view=rev
Log:
Made the cpmg_frq() function accept only None for the reference spectrum and 
corrected a typo.


Modified:
    branches/relax_disp/prompt/relax_disp.py

Modified: branches/relax_disp/prompt/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/prompt/relax_disp.py?rev=8347&r1=8346&r2=8347&view=diff
==============================================================================
--- branches/relax_disp/prompt/relax_disp.py (original)
+++ branches/relax_disp/prompt/relax_disp.py Thu Jan  8 21:18:09 2009
@@ -30,7 +30,7 @@
 
 # relax module imports.
 import help
-from relax_errors import RelaxNumError, RelaxStrError
+from relax_errors import RelaxNoneNumError, RelaxNumError, RelaxStrError
 from specific_fns.setup import relax_disp_obj
 
 
@@ -107,7 +107,7 @@
         ~~~~~~~~~~~
 
         This user function allows the CPMG pulse train frequency of a given 
spectrum to be set.
-        If a value of 0 is set for frequency, then the spectrum will be 
treated as a reference
+        If None is given for frequency, then the spectrum will be treated as 
a reference
         spectrum.
 
 
@@ -116,8 +116,8 @@
 
         To identify the reference spectrum called 'reference_spectrum', type:
 
-        relax> relax_disp.cpmg_frq(0, 'reference_spectrum')
-        relax> relax_disp.cpmg_frq(cpmg_frq=0, 
spectrum_id='reference_spectrum')
+        relax> relax_disp.cpmg_frq(None, 'reference_spectrum')
+        relax> relax_disp.cpmg_frq(cpmg_frq=None, 
spectrum_id='reference_spectrum')
 
         To set a frequency of 200 Hz for the spectrum '200_Hz_spectrum', 
type:
 
@@ -128,13 +128,13 @@
         # Function intro text.
         if self.__relax__.interpreter.intro:
             text = sys.ps3 + "relax_disp.cpmg_frq("
-            text = text + ", cpmg_frq=" + `cpmg_frq` + ")"
-            text = text + "spectrum_id=" + `spectrum_id`
+            text = text + ", cpmg_frq=" + `cpmg_frq`
+            text = text + "spectrum_id=" + `spectrum_id` + ")"
             print text
 
         # The cpmg_frq argument.
-        if type(cpmg_frq) != float and type(cpmg_frq) != int:
-            raise RelaxNumError, ('cpmg_frq', cpmg_frq)
+        if type(cpmg_frq) != float and type(cpmg_frq) != int and cpmg_frq != 
None:
+            raise RelaxNoneNumError, ('cpmg_frq', cpmg_frq)
 
         # The spectrum_id argument.
         if type(spectrum_id) != str: