r12522 - /branches/bmrb/generic_fns/relax_data.py -- February 15, 2011 - 08:55

Author: bugman
Date: Tue Feb 15 08:55:04 2011
New Revision: 12522

URL: http://svn.gna.org/viewcvs/relax?rev=12522&view=rev
Log:
The relaxation values and errors from the BMRB file are being converted from 
ms to s now.


Modified:
    branches/bmrb/generic_fns/relax_data.py

Modified: branches/bmrb/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/relax_data.py?rev=12522&r1=12521&r2=12522&view=diff
==============================================================================
--- branches/bmrb/generic_fns/relax_data.py (original)
+++ branches/bmrb/generic_fns/relax_data.py Tue Feb 15 08:55:04 2011
@@ -25,7 +25,7 @@
 
 # Python module imports.
 from copy import deepcopy
-from numpy import int32, ones, zeros
+from numpy import array, float64, int32, ones, zeros
 import string
 import sys
 from warnings import warn
@@ -271,8 +271,17 @@
         # Generate the sequence if needed.
         bmrb.generate_sequence(N, spin_names=data['atom_names'], 
res_nums=data['res_nums'], res_names=data['res_names'], mol_names=mol_names)
 
+        # The data and error.
+        vals = array(data['data'], float64)
+        errors = array(data['errors'], float64)
+
+        # Scaling.
+        if 'units' in keys and data['units'] == 'ms':
+            vals = vals / 1000
+            vals = errors / 1000
+
         # Pack the data.
-        pack_data(ri_label, frq_label, frq, data['data'], data['errors'], 
mol_names=mol_names, res_nums=data['res_nums'], res_names=data['res_names'], 
spin_nums=None, spin_names=data['atom_names'], gen_seq=True)
+        pack_data(ri_label, frq_label, frq, vals, errors, 
mol_names=mol_names, res_nums=data['res_nums'], res_names=data['res_names'], 
spin_nums=None, spin_names=data['atom_names'], gen_seq=True)