r5788 - /1.3/specific_fns/model_free/model_free.py -- April 16, 2008 - 17:23

Author: bugman
Date: Wed Apr 16 17:23:32 2008
New Revision: 5788

URL: http://svn.gna.org/viewcvs/relax?rev=5788&view=rev
Log:
Converted the model-free return_units() method to the new design.


Modified:
    1.3/specific_fns/model_free/model_free.py

Modified: 1.3/specific_fns/model_free/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/model_free.py?rev=5788&r1=5787&r2=5788&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/model_free.py (original)
+++ 1.3/specific_fns/model_free/model_free.py Wed Apr 16 17:23:32 2008
@@ -2790,13 +2790,24 @@
             return '\\qCSA\\Q'
 
 
-    def return_units(self, param):
+    def return_units(self, param, spin_id):
         """Function for returning a string representing the parameters units.
 
         For example, the internal representation of te is in seconds, 
whereas the external
         representation is in picoseconds, therefore this function will 
return the string
         'picoseconds' for te.
+
+
+        @param param:   The name of the parameter to return the units string 
for.
+        @type param:    str
+        @param spin_id: The spin identification string.
+        @type spin_id:  str
+        @return:        The parameter units string.
+        @rtype:         str
         """
+
+        # Get the spin.
+        spin = return_spin(spin_id)
 
         # Get the object name.
         object_name = self.return_data_name(param)
@@ -2811,7 +2822,7 @@
 
         # Rex (value at 1st field strength).
         elif object_name == 'rex':
-            return relax_data_store.frq_labels[self.run][0] + ' MHz'
+            return spin.frq_labels[0] + ' MHz'
 
         # Bond length (Angstrom).
         elif object_name == 'r':