r19737 - in /branches/relax_disp: ./ pipe_control/spectrometer.py -- May 24, 2013 - 17:22

Author: bugman
Date: Fri May 24 17:22:06 2013
New Revision: 19737

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

........
  r19736 | bugman | 2013-05-24 17:08:02 +0200 (Fri, 24 May 2013) | 5 lines
  
  Bug fix for the pipe_control.spectrometer.get_frequencies() function.
  
  The units argument was incorrectly referenced.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/pipe_control/spectrometer.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 24 17:22:06 2013
@@ -1,1 +1,1 @@
-/trunk:1-19733
+/trunk:1-19736

Modified: branches/relax_disp/pipe_control/spectrometer.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/spectrometer.py?rev=19737&r1=19736&r2=19737&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/spectrometer.py (original)
+++ branches/relax_disp/pipe_control/spectrometer.py Fri May 24 17:22:06 2013
@@ -166,7 +166,7 @@
             frq.append(value * 1e-6)
 
         # Tesla.
-        elif unit == 'T':
+        elif units == 'T':
             frq.append(value * 2.0 * pi / g1H)
 
         # Unknown units.