r19482 - /branches/relax_disp/specific_analyses/relax_disp.py -- April 15, 2013 - 18:40

Author: bugman
Date: Mon Apr 15 18:40:23 2013
New Revision: 19482

URL: http://svn.gna.org/viewcvs/relax?rev=19482&view=rev
Log:
The relax_disp.cpmg_frq user function can now handle values of None.

The float function is no longer used if the value of None is encountered.


Modified:
    branches/relax_disp/specific_analyses/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=19482&r1=19481&r2=19482&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Mon Apr 15 18:40:23 
2013
@@ -403,7 +403,10 @@
             cdp.cpmg_frqs_list = []
 
         # Add the frequency at the correct position, converting to a float 
if needed.
-        cdp.cpmg_frqs[spectrum_id] = float(cpmg_frq)
+        if cpmg_frq == None:
+            cdp.cpmg_frqs[spectrum_id] = cpmg_frq
+        else:
+            cdp.cpmg_frqs[spectrum_id] = float(cpmg_frq)
 
         # The unique curves for the R2eff fitting (CPMG).
         if cdp.cpmg_frqs[spectrum_id] not in cdp.cpmg_frqs_list: