r4072 - in /1.3/specific_fns: main.py relax_data.py -- November 27, 2007 - 11:23

Author: bugman
Date: Tue Nov 27 11:23:43 2007
New Revision: 4072

URL: http://svn.gna.org/viewcvs/relax?rev=4072&view=rev
Log:
Removed the Rx_data class instance from self.relax.specific.

The class instance is now within the module to be imported by who ever wants 
it.


Modified:
    1.3/specific_fns/main.py
    1.3/specific_fns/relax_data.py

Modified: 1.3/specific_fns/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/main.py?rev=4072&r1=4071&r2=4072&view=diff
==============================================================================
--- 1.3/specific_fns/main.py (original)
+++ 1.3/specific_fns/main.py Tue Nov 27 11:23:43 2007
@@ -25,7 +25,6 @@
 from jw_mapping import Jw_mapping
 from model_free import Model_free
 from noe import Noe
-from relax_data import Rx_data
 from relax_fit import Relax_fit
 
 
@@ -41,5 +40,4 @@
         self.jw_mapping = Jw_mapping(self.relax)
         self.model_free = Model_free(self.relax)
         self.noe = Noe(self.relax)
-        self.relax_data = Rx_data(self.relax)
         self.relax_fit = Relax_fit(self.relax)

Modified: 1.3/specific_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_data.py?rev=4072&r1=4071&r2=4072&view=diff
==============================================================================
--- 1.3/specific_fns/relax_data.py (original)
+++ 1.3/specific_fns/relax_data.py Tue Nov 27 11:23:43 2007
@@ -29,14 +29,9 @@
 from relax_errors import RelaxError, RelaxNoResError, RelaxNoRiError, 
RelaxNoPipeError, RelaxNoSequenceError, RelaxRiError
 
 
-# The relax data storage object.
-
-
 class Rx_data:
-    def __init__(self, relax):
+    def __init__(self):
         """Class containing functions for relaxation data."""
-
-        self.relax = relax
 
         # Global data flag (default to residue specific data).
         self.global_flag = 0
@@ -856,3 +851,7 @@
 
         # Write the data.
         self.relax.generic.value.write(run=self.run, param=(self.ri_label, 
self.frq_label), file=file, dir=dir, force=force, 
return_value=self.return_value)
+
+
+# Instantiate the class.
+relax_data = Rx_data()