r6470 - /1.3/specific_fns/model_free/main.py -- June 23, 2008 - 23:56

Author: bugman
Date: Mon Jun 23 23:56:04 2008
New Revision: 6470

URL: http://svn.gna.org/viewcvs/relax?rev=6470&view=rev
Log:
Bug fix for return_conversion_factor(), the spin container only needs to be 
given for the Rex param.


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=6470&r1=6469&r2=6470&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Mon Jun 23 23:56:04 2008
@@ -1829,16 +1829,18 @@
         @rtype:         float
         """
 
-        # The spin must be specified to get frequency units.
-        if spin == None and spin_id == None:
-            raise RelaxNoSpinSpecError
-
-        # Get the spin.
-        if not spin:
-            spin = return_spin(spin_id)
-
         # Get the object name.
         object_name = self.return_data_name(param)
+
+        # Test for objects needing the spin container.
+        if object_name in ['rex']:
+            # The spin must be specified to get frequency to scale the Rex 
value by.
+            if spin == None and spin_id == None:
+                raise RelaxNoSpinSpecError
+
+            # Get the spin.
+            if not spin:
+                spin = return_spin(spin_id)
 
         # tm (nanoseconds).
         if object_name == 'tm' or object_name == 'local_tm':