r7699 - /1.3/prompt/relax_fit.py -- October 14, 2008 - 22:42

Author: bugman
Date: Tue Oct 14 22:42:18 2008
New Revision: 7699

URL: http://svn.gna.org/viewcvs/relax?rev=7699&view=rev
Log:
The relaxation curve time point can now be an integer to allow the time of 
'0'.

See the post at https://mail.gna.org/public/relax-devel/2008-10/msg00040.html 
(Message-id:
<7f080ed10810141213s2211d36fre56906e0ae5903e2@xxxxxxxxxxxxxx>).


Modified:
    1.3/prompt/relax_fit.py

Modified: 1.3/prompt/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/relax_fit.py?rev=7699&r1=7698&r2=7699&view=diff
==============================================================================
--- 1.3/prompt/relax_fit.py (original)
+++ 1.3/prompt/relax_fit.py Tue Oct 14 22:42:18 2008
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2004, 2006 Edward d'Auvergne                                 
 #
+# Copyright (C) 2004-2008 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -25,7 +25,7 @@
 
 # relax module imports.
 import help
-from relax_errors import RelaxFloatError, RelaxNoneIntError, 
RelaxNoneStrError, RelaxStrError
+from relax_errors import RelaxFloatError, RelaxNoneIntError, 
RelaxNoneStrError, RelaxNumError, RelaxStrError
 from specific_fns.setup import relax_fit_obj
 
 
@@ -173,8 +173,8 @@
             raise RelaxNoneStrError, ('directory name', dir)
 
         # The relaxation time.
-        if type(relax_time) != float:
-            raise RelaxFloatError, ('relaxation time', relax_time)
+        if type(relax_time) != int and type(relax_time) != float:
+            raise RelaxNumError, ('relaxation time', relax_time)
 
         # The format.
         if type(format) != str: