r19238 - in /branches/relax_disp: specific_analyses/relax_disp.py user_functions/relax_disp.py -- March 27, 2013 - 15:25

Author: bugman
Date: Wed Mar 27 15:25:23 2013
New Revision: 19238

URL: http://svn.gna.org/viewcvs/relax?rev=19238&view=rev
Log:
Ported r8688 from the old relax_disp branch into the new branch.

The command used was:
svn merge -r8687:8688 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
 specific_analyses

The prompt package changes were manually ported to the user_functions package.

.....
  r8688 | semor | 2009-01-27 23:24:12 +0100 (Tue, 27 Jan 2009) | 3 lines
  Changed paths:
     M /branches/relax_disp/prompt/relax_disp.py
     M /branches/relax_disp/specific_fns/relax_disp.py
  
  Changed the default value for 'int_cpmg' to avoid an impossible 
mathematical situation: ln(0).
.....


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py
    branches/relax_disp/user_functions/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=19238&r1=19237&r2=19238&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 15:25:23 
2013
@@ -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'.
 

Modified: branches/relax_disp/user_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/relax_disp.py?rev=19238&r1=19237&r2=19238&view=diff
==============================================================================
--- branches/relax_disp/user_functions/relax_disp.py (original)
+++ branches/relax_disp/user_functions/relax_disp.py Wed Mar 27 15:25:23 2013
@@ -63,7 +63,7 @@
 )
 uf.add_keyarg(
     name = "int_cpmg",
-    default = "0.0",
+    default = "1.0",
     py_type = "float",
     desc_short = "CPMG peak intensity",
     desc = "Intensity of the peak in the CPMG spectrum.."