r4153 - in /1.3: ./ specific_fns/ specific_fns/model_free/ -- December 09, 2007 - 18:57

Author: bugman
Date: Sun Dec  9 18:56:59 2007
New Revision: 4153

URL: http://svn.gna.org/viewcvs/relax?rev=4153&view=rev
Log:
Big bug fixes.

The structures 'self.relax.specific' and 'self.relax.specific_setup' no 
longer exist!


Modified:
    1.3/relax
    1.3/specific_fns/hybrid.py
    1.3/specific_fns/jw_mapping.py
    1.3/specific_fns/model_free/model_free.py
    1.3/specific_fns/noe.py
    1.3/specific_fns/relax_fit.py

Modified: 1.3/relax
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax?rev=4153&r1=4152&r2=4153&view=diff
==============================================================================
--- 1.3/relax (original)
+++ 1.3/relax Sun Dec  9 18:56:59 2007
@@ -71,8 +71,6 @@
 import relax_errors
 from relax_io import log
 import relax_warnings
-from specific_fns.main import Specific
-from specific_fns.specific_setup import Specific_setup
 from test_suite.runner import Test_suite_runner
 from test_suite.unit_tests.unit_test_runner import Unit_test_runner
 from thread_classes import Threading, ThreadData
@@ -111,14 +109,8 @@
         # Colour operations.
         self.colour = Colour()
 
-        # Setup the specific setup object.
-        self.specific_setup = Specific_setup(self)
-
         # Setup the object containing the generic functions.
         self.generic = generic_fns
-
-        # Setup the object containing the specific functions.
-        self.specific = Specific(self)
 
         # Setup the object containing the thread setup functions.
         self.threading = Threading(self)

Modified: 1.3/specific_fns/hybrid.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/hybrid.py?rev=4153&r1=4152&r2=4153&view=diff
==============================================================================
--- 1.3/specific_fns/hybrid.py (original)
+++ 1.3/specific_fns/hybrid.py Sun Dec  9 18:56:59 2007
@@ -25,14 +25,9 @@
 from relax_errors import RelaxError, RelaxNoPipeError, RelaxNoSequenceError, 
RelaxPipeError, RelaxSequenceError
 
 
-# The relax data storage object.
-
-
 class Hybrid:
-    def __init__(self, relax):
+    def __init__(self):
         """Class containing function specific to hybrid models."""
-
-        self.relax = relax
 
 
     def duplicate_data(self, new_run=None, old_run=None, instance=None):

Modified: 1.3/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=4153&r1=4152&r2=4153&view=diff
==============================================================================
--- 1.3/specific_fns/jw_mapping.py (original)
+++ 1.3/specific_fns/jw_mapping.py Sun Dec  9 18:56:59 2007
@@ -32,14 +32,9 @@
 from physical_constants import N15_CSA, NH_BOND_LENGTH
 
 
-# The relax data storage object.
-
-
 class Jw_mapping(Common_functions):
-    def __init__(self, relax):
+    def __init__(self):
         """Class containing functions specific to reduced spectral density 
mapping."""
-
-        self.relax = relax
 
 
     def calculate(self, run=None, print_flag=1, sim_index=None):

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=4153&r1=4152&r2=4153&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/model_free.py (original)
+++ 1.3/specific_fns/model_free/model_free.py Sun Dec  9 18:56:59 2007
@@ -44,13 +44,11 @@
 
 
 class Model_free(Common_functions):
-    def __init__(self, relax):
+    def __init__(self):
         """Class containing functions specific to model-free analysis."""
 
-        self.relax = relax
-
         # Class containing the Molmol specific functions.
-        self.molmol = Molmol(self.relax)
+        self.molmol = Molmol()
 
 
     def are_mf_params_set(self, index=None):
@@ -5185,10 +5183,8 @@
 ##############################
 
 class Molmol:
-    def __init__(self, relax):
+    def __init__(self):
         """Class containing the Molmol specific functions."""
-
-        self.relax = relax
 
 
     def classic(self, data_type, colour_start, colour_end, colour_list):

Modified: 1.3/specific_fns/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/noe.py?rev=4153&r1=4152&r2=4153&view=diff
==============================================================================
--- 1.3/specific_fns/noe.py (original)
+++ 1.3/specific_fns/noe.py Sun Dec  9 18:56:59 2007
@@ -29,15 +29,9 @@
 from relax_errors import RelaxArgNotInListError, RelaxError, 
RelaxInvalidDataError, RelaxNoPipeError, RelaxNoSequenceError, 
RelaxRegExpError
 
 
-# The relax data storage object.
-
-
-
 class Noe:
-    def __init__(self, relax):
+    def __init__(self):
         """Class containing functions for relaxation data."""
-
-        self.relax = relax
 
 
     def assign_function(self, run=None, i=None, intensity=None):

Modified: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=4153&r1=4152&r2=4153&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Sun Dec  9 18:56:59 2007
@@ -43,15 +43,10 @@
     C_module_exp_fn = 1
 
 
-# The relax data storage object.
-
-
 
 class Relax_fit(Common_functions):
-    def __init__(self, relax):
+    def __init__(self):
         """Class containing functions for relaxation data."""
-
-        self.relax = relax
 
 
     def assemble_param_vector(self, index=None, sim_index=None):