r6686 - /1.3/prompt/grace.py -- July 04, 2008 - 19:36

Author: semor
Date: Fri Jul  4 19:21:03 2008
New Revision: 6686

URL: http://svn.gna.org/viewcvs/relax?rev=6686&view=rev
Log:
Converted the force flags to bools.


Modified:
    1.3/prompt/grace.py

Modified: 1.3/prompt/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/grace.py?rev=6686&r1=6685&r2=6686&view=diff
==============================================================================
--- 1.3/prompt/grace.py (original)
+++ 1.3/prompt/grace.py Fri Jul  4 19:21:03 2008
@@ -101,7 +101,7 @@
         self.__relax__.generic.grace.view(file=file, dir=dir, 
grace_exe=grace_exe)
 
 
-    def write(self, x_data_type='res', y_data_type=None, res_num=None, 
res_name=None, plot_data='value', norm=0, file=None, dir='grace', force=0):
+    def write(self, x_data_type='res', y_data_type=None, res_num=None, 
res_name=None, plot_data='value', norm=0, file=None, dir='grace', 
force=False):
         """Function for creating a grace '.agr' file.
 
         Keyword Arguments
@@ -123,7 +123,7 @@
 
         dir:  The directory name.
 
-        force:  A flag which, if set to 1, will cause the file to be 
overwritten.
+        force:  A flag which, if set to True, will cause the file to be 
overwritten.
 
 
         Description
@@ -169,14 +169,14 @@
         relax> grace.write('res', 'noe', file='noe.agr')
         relax> grace.write(y_data_type='noe', file='noe.agr')
         relax> grace.write(x_data_type='res', y_data_type='noe', 
file='noe.agr')
-        relax> grace.write(y_data_type='noe', file='noe.agr', force=1)
+        relax> grace.write(y_data_type='noe', file='noe.agr', force=True)
 
 
         To create a Grace file of 'S2' vs. 'te' for all residues, type:
 
         relax> grace.write('S2', 'te', file='s2_te.agr')
         relax> grace.write(x_data_type='S2', y_data_type='te', 
file='s2_te.agr')
-        relax> grace.write(x_data_type='S2', y_data_type='te', 
file='s2_te.agr', force=1)
+        relax> grace.write(x_data_type='S2', y_data_type='te', 
file='s2_te.agr', force=True)
 
 
         To create a Grace file of the Monte Carlo simulation values of 'Rex' 
vs. 'te' for residue
@@ -195,7 +195,7 @@
         emphasises any problems.  To produce this Grace file, type:
 
         relax> grace.write(name, x_data_type='relax_times', 
y_data_type='ave_int',
-                           norm=1, file='intensities_norm.agr', force=1)
+                           norm=1, file='intensities_norm.agr', force=True)
         """
 
         # Function intro text.
@@ -241,8 +241,8 @@
             raise RelaxNoneStrError, ('directory name', dir)
 
         # The force flag.
-        if type(force) != int or (force != 0 and force != 1):
-            raise RelaxBinError, ('force flag', force)
+        if type(force) != bool:
+            raise RelaxBoolError, ('force flag', force)
 
         # Execute the functional code.
         grace.write(x_data_type=x_data_type, y_data_type=y_data_type, 
res_num=res_num, res_name=res_name, plot_data=plot_data, norm=norm, 
file=file, dir=dir, force=force)