r8861 - in /1.3/generic_fns: minimise.py value.py -- February 22, 2009 - 23:00

Author: bugman
Date: Sun Feb 22 23:00:08 2009
New Revision: 8861

URL: http://svn.gna.org/viewcvs/relax?rev=8861&view=rev
Log:
Fixed some circular import issues.


Modified:
    1.3/generic_fns/minimise.py
    1.3/generic_fns/value.py

Modified: 1.3/generic_fns/minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/minimise.py?rev=8861&r1=8860&r2=8861&view=diff
==============================================================================
--- 1.3/generic_fns/minimise.py (original)
+++ 1.3/generic_fns/minimise.py Sun Feb 22 23:00:08 2009
@@ -30,7 +30,7 @@
 from generic_fns.mol_res_spin import spin_loop
 from generic_fns import pipes
 from relax_errors import RelaxError
-from specific_fns.setup import get_specific_fn
+import specific_fns
 
 
 def reset_min_stats(data_pipe=None, spin=None):
@@ -122,8 +122,8 @@
     cdp = pipes.get_pipe()
 
     # Specific calculate function setup.
-    calculate = get_specific_fn('calculate', cdp.pipe_type)
-    overfit_deselect = get_specific_fn('overfit_deselect', cdp.pipe_type)
+    calculate = specific_fns.setup.get_specific_fn('calculate', 
cdp.pipe_type)
+    overfit_deselect = 
specific_fns.setup.get_specific_fn('overfit_deselect', cdp.pipe_type)
 
     # Deselect residues lacking data:
     overfit_deselect()
@@ -166,8 +166,8 @@
     cdp = pipes.get_pipe()
 
     # Specific grid search function.
-    grid_search = get_specific_fn('grid_search', cdp.pipe_type)
-    overfit_deselect = get_specific_fn('overfit_deselect', cdp.pipe_type)
+    grid_search = specific_fns.setup.get_specific_fn('grid_search', 
cdp.pipe_type)
+    overfit_deselect = 
specific_fns.setup.get_specific_fn('overfit_deselect', cdp.pipe_type)
 
     # Deselect residues lacking data:
     overfit_deselect()
@@ -217,8 +217,8 @@
     cdp = pipes.get_pipe()
 
     # Specific minimisation function.
-    minimise = get_specific_fn('minimise', cdp.pipe_type)
-    overfit_deselect = get_specific_fn('overfit_deselect', cdp.pipe_type)
+    minimise = specific_fns.setup.get_specific_fn('minimise', cdp.pipe_type)
+    overfit_deselect = 
specific_fns.setup.get_specific_fn('overfit_deselect', cdp.pipe_type)
 
     # Deselect residues lacking data:
     overfit_deselect()

Modified: 1.3/generic_fns/value.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/value.py?rev=8861&r1=8860&r2=8861&view=diff
==============================================================================
--- 1.3/generic_fns/value.py (original)
+++ 1.3/generic_fns/value.py Sun Feb 22 23:00:08 2009
@@ -33,7 +33,7 @@
 from generic_fns.sequence import write_header, write_line
 from relax_errors import RelaxError, RelaxFileEmptyError, 
RelaxNoSequenceError, RelaxNoSpinError, RelaxParamSetError, RelaxValueError
 from relax_io import extract_data, open_write_file, strip
-from specific_fns.setup import get_specific_fn
+import specific_fns
 
 
 def copy(pipe_from=None, pipe_to=None, param=None):
@@ -66,7 +66,7 @@
         raise RelaxNoSequenceError, pipe_to
 
     # Specific value and error returning function.
-    return_value = get_specific_fn('return_value', pipes.get_type(pipe_from))
+    return_value = specific_fns.setup.get_specific_fn('return_value', 
pipes.get_type(pipe_from))
 
     # Test if the data exists for pipe_to.
     for spin in spin_loop(pipe_to):
@@ -126,7 +126,7 @@
     """
 
     # Specific functions.
-    is_spin_param = get_specific_fn('is_spin_param', pipes.get_type())
+    is_spin_param = specific_fns.setup.get_specific_fn('is_spin_param', 
pipes.get_type())
 
     # Initialise.
     spin_params = []
@@ -245,7 +245,7 @@
         min_stat = False
 
         # Specific v
-        return_value = get_specific_fn('return_value', pipes.get_type())
+        return_value = specific_fns.setup.get_specific_fn('return_value', 
pipes.get_type())
 
         # Specific set function.
         set = set_spin_params
@@ -364,8 +364,8 @@
     pipes.test()
 
     # Specific functions.
-    return_value = get_specific_fn('return_value', pipes.get_type())
-    set_non_spin_params = get_specific_fn('set_non_spin_params', 
pipes.get_type())
+    return_value = specific_fns.setup.get_specific_fn('return_value', 
pipes.get_type())
+    set_non_spin_params = 
specific_fns.setup.get_specific_fn('set_non_spin_params', pipes.get_type())
 
     # The parameters have been specified.
     if param:
@@ -453,10 +453,10 @@
     """
 
     # Specific functions.
-    data_init = get_specific_fn('data_init', pipes.get_type())
-    default_value = get_specific_fn('default_value', pipes.get_type())
-    return_data_name = get_specific_fn('return_data_name', pipes.get_type())
-    set_update = get_specific_fn('set_update', pipes.get_type())
+    data_init = specific_fns.setup.get_specific_fn('data_init', 
pipes.get_type())
+    default_value = specific_fns.setup.get_specific_fn('default_value', 
pipes.get_type())
+    return_data_name = 
specific_fns.setup.get_specific_fn('return_data_name', pipes.get_type())
+    set_update = specific_fns.setup.get_specific_fn('set_update', 
pipes.get_type())
 
 
     # Setting the model parameters prior to minimisation.
@@ -601,7 +601,7 @@
 
     # Get the value and error returning function if required.
     if not return_value:
-        return_value = get_specific_fn('return_value', pipes.get_type())
+        return_value = specific_fns.setup.get_specific_fn('return_value', 
pipes.get_type())
 
     # Format string.
     format = "%-30s%-30s"