r8976 - /1.3/specific_fns/model_free/main.py -- March 12, 2009 - 18:56

Author: semor
Date: Thu Mar 12 18:56:28 2009
New Revision: 8976

URL: http://svn.gna.org/viewcvs/relax?rev=8976&view=rev
Log:
Reverted r8974.

This follows a remark by Ed at:
https://mail.gna.org/public/relax-devel/2009-03/msg00033.html
(Message-id: <7f080ed10903121024h7a0a3808m3c268ca1f276ee4a@xxxxxxxxxxxxxx>)

The command used was:
svn merge -r8974:8973 .


Modified:
    1.3/specific_fns/model_free/main.py

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=8976&r1=8975&r2=8976&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Thu Mar 12 18:56:28 2009
@@ -2370,25 +2370,25 @@
             if not spin:
                 spin = return_spin(spin_id)
 
-        # tm (seconds).
+        # tm (nanoseconds).
         if object_name == 'tm' or object_name == 'local_tm':
-            return 's'
-
-        # te, tf, and ts (seconds).
+            return 'ns'
+
+        # te, tf, and ts (picoseconds).
         elif object_name in ['te', 'tf', 'ts']:
-            return 's'
-
-        # Rex (field independant value).
+            return 'ps'
+
+        # Rex (value at 1st field strength).
         elif object_name == 'rex' and hasattr(spin, 'frq_labels') and 
spin.frq_labels != None and len(spin.frq_labels):
-            return 'sigma_ex = Rex / omega**2'
-
-        # Bond length (meters).
+            return spin.frq_labels[0] + ' MHz'
+
+        # Bond length (Angstrom).
         elif object_name == 'r':
-            return 'm'
-
-        # CSA (unitless).
+            return 'Angstrom'
+
+        # CSA (ppm).
         elif object_name == 'csa':
-            return 'unitless'
+            return 'ppm'
 
 
     def select_model(self, model=None, spin_id=None):