r8688 - in /branches/relax_disp: prompt/relax_disp.py specific_fns/relax_disp.py -- January 27, 2009 - 23:24

Author: semor
Date: Tue Jan 27 23:24:12 2009
New Revision: 8688

URL: http://svn.gna.org/viewcvs/relax?rev=8688&view=rev
Log:
Changed the default value for 'int_cpmg' to avoid an impossible mathematical 
situation: ln(0).


Modified:
    branches/relax_disp/prompt/relax_disp.py
    branches/relax_disp/specific_fns/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=8688&r1=8687&r2=8688&view=diff
==============================================================================
--- branches/relax_disp/prompt/relax_disp.py (original)
+++ branches/relax_disp/prompt/relax_disp.py Tue Jan 27 23:24:12 2009
@@ -47,7 +47,7 @@
         self.__relax__ = relax
 
 
-    def calc_r2eff(self, exp_type='cpmg', id=None, delayT=None, 
int_cpmg=0.0, int_ref=1.0):
+    def calc_r2eff(self, exp_type='cpmg', id=None, delayT=None, 
int_cpmg=1.0, int_ref=1.0):
         """Calculate the effective transversal relaxation rate from the peak 
intensities.
 
         THIS FUNCTION IS NOT WRITTEN YET.

Modified: branches/relax_disp/specific_fns/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_fns/relax_disp.py?rev=8688&r1=8687&r2=8688&view=diff
==============================================================================
--- branches/relax_disp/specific_fns/relax_disp.py (original)
+++ branches/relax_disp/specific_fns/relax_disp.py Tue Jan 27 23:24:12 2009
@@ -241,7 +241,7 @@
         return results[result_index]
 
 
-    def calc_r2eff(self, exp_type='cpmg', id=None, delayT=None, 
int_cpmg=0.0, int_ref=1.0):
+    def calc_r2eff(self, exp_type='cpmg', id=None, delayT=None, 
int_cpmg=1.0, int_ref=1.0):
         """Calculate the effective transversal relaxation rate from the peak 
intensities. The
         equation depends on the experiment type chosen, either 'cpmg' or 
'r1rho'.