r16812 - in /branches/frame_order_testing: ./ generic_fns/bruker.py -- June 10, 2012 - 14:25

Author: bugman
Date: Sun Jun 10 14:25:00 2012
New Revision: 16812

URL: http://svn.gna.org/viewcvs/relax?rev=16812&view=rev
Log:
Merged revisions 16728 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r16728 | bugman | 2012-06-07 15:35:54 +0200 (Thu, 07 Jun 2012) | 5 lines
  
  Bug fix for the bruker.read user function for reading Bruker Dynamics 
Centre files.
  
  The spectrometer frequency needs to be converted from MHz to Hz!
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/generic_fns/bruker.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jun 10 14:25:00 2012
@@ -1,1 +1,1 @@
-/1.3:1-16708
+/1.3:1-16811

Modified: branches/frame_order_testing/generic_fns/bruker.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/bruker.py?rev=16812&r1=16811&r2=16812&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/bruker.py (original)
+++ branches/frame_order_testing/generic_fns/bruker.py Sun Jun 10 14:25:00 
2012
@@ -143,9 +143,9 @@
             elif search('NOE', row[1]):
                 ri_type = 'NOE'
 
-        # Get the frequency.
+        # Get the frequency, converting to Hz.
         elif row[0] == 'Proton frequency[MHz]:':
-            frq = float(row[1])
+            frq = float(row[1]) * 1e6
 
         # Inside the relaxation data section.
         elif row[0] == 'SECTION:' and row[1] == 'results':