r21156 - /branches/relax_disp/specific_analyses/relax_disp/disp_data.py -- October 17, 2013 - 11:17

Author: bugman
Date: Thu Oct 17 11:17:06 2013
New Revision: 21156

URL: http://svn.gna.org/viewcvs/relax?rev=21156&view=rev
Log:
Python 3 fixes for the dispersion data key generation and the data assembly.

The specific_analyses.relax_disp.disp_data.return_param_key_from_data() 
function was generating
different keys for Python 2 and 3.  This has been fixed.  The 
return_r2eff_arrays() function has
also been modified to correctly check for these keys.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/disp_data.py

Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=21156&r1=21155&r2=21156&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/disp_data.py Thu Oct 17 
11:17:06 2013
@@ -1386,8 +1386,8 @@
     if frq == None:
         return "%s" % point
 
-    # Generate and return the key.
-    return "%s_%s" % (frq/1e6, point)
+    # Generate and return the unique key.
+    return "%.8f_%.3f" % (frq/1e6, point)
 
 
 def return_r1_data(spins=None, spin_ids=None, fields=None, field_count=None, 
sim_index=None):
@@ -1519,7 +1519,7 @@
                 frqs[spin_index, frq_index] = 2.0 * pi * frq / g1H * 
return_gyromagnetic_ratio(spin.isotope) * 1e-6
 
             # Missing data.
-            if key not in spin.r2eff:
+            if key not in spin.r2eff.keys():
                 continue
 
             # The values.