r11188 - /1.3/generic_fns/grace.py -- May 18, 2010 - 17:54

Author: bugman
Date: Tue May 18 17:54:30 2010
New Revision: 11188

URL: http://svn.gna.org/viewcvs/relax?rev=11188&view=rev
Log:
Broke some nasty circular import caused by importing the generic_fns.grace 
module.


Modified:
    1.3/generic_fns/grace.py

Modified: 1.3/generic_fns/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/grace.py?rev=11188&r1=11187&r2=11188&view=diff
==============================================================================
--- 1.3/generic_fns/grace.py (original)
+++ 1.3/generic_fns/grace.py Tue May 18 17:54:30 2010
@@ -35,7 +35,7 @@
 from relax_errors import RelaxError, RelaxNoSequenceError, RelaxNoSimError
 from relax_io import get_file_path, open_write_file, test_binary
 from relax_warnings import RelaxWarning
-from specific_fns.setup import get_specific_fn
+import specific_fns
 
 
 def determine_seq_type(spin_id=None):
@@ -89,8 +89,8 @@
     data_list = False
 
     # Specific x and y value returning functions.
-    x_return_value = y_return_value = get_specific_fn('return_value', 
pipes.get_type())
-    x_return_conversion_factor = y_return_conversion_factor = 
get_specific_fn('return_conversion_factor', pipes.get_type())
+    x_return_value = y_return_value = 
specific_fns.setup.get_specific_fn('return_value', pipes.get_type())
+    x_return_conversion_factor = y_return_conversion_factor = 
specific_fns.setup.get_specific_fn('return_conversion_factor', 
pipes.get_type())
 
     # Test if the X-axis data type is a minimisation statistic.
     if x_data_type != 'spin' and 
generic_fns.minimise.return_data_name(x_data_type):
@@ -474,8 +474,8 @@
             analysis_spec = True
 
             # Specific value and error, conversion factor, and units 
returning functions.
-            return_units = get_specific_fn('return_units', pipes.get_type())
-            return_grace_string = get_specific_fn('return_grace_string', 
pipes.get_type())
+            return_units = 
specific_fns.setup.get_specific_fn('return_units', pipes.get_type())
+            return_grace_string = 
specific_fns.setup.get_specific_fn('return_grace_string', pipes.get_type())
 
             # Test if the axis data type is a minimisation statistic.
             if data_type[i] and data_type[i] != 'spin' and 
generic_fns.minimise.return_data_name(data_type[i]):