Author: bugman
Date: Wed Nov 8 06:50:25 2006
New Revision: 2772
URL: http://svn.gna.org/viewcvs/relax?rev=2772&view=rev
Log:
Due to the failure of 'state.save()', i.e. can't pickle, 'data.py' has been
split up and redesigned.
A new directory 'data' has been created to all the modules for constructing
'self.relax.data'. The
file 'data.py' has been moved into the directory as 'data/main.py' and
duplicated into three more
files.
All the 'self._auto_object*()' methods for automatically creating the
diffusion tensor data
structures have been shifted into the module 'data.diff_tensor_auto_objects'.
These have been
converted into functions and all references to 'self' have been eliminated.
The local namespace of
'self.relax.data.diff[run]' is now passed into these functions as the first
argument to allow its
objects to be accessed. This change fixes the pickling problem and restores
the state saving and
loading functions.
In the module 'data.diff_tensor', all that remains of the original 'data.py'
file is the data
containers 'DiffTensorData' and 'DiffTensorElement' as well as the
'DiffAutoNumericObject' and
'DiffAutoSimArrayObject' automatically generated objects. The first two
classes assign the
'auto_object*()' functions to specific instances of the last two classes
which then call the
functions to obtain the data.
The data containers 'Element', 'SpecificData', 'Residue', and 'ResidueList'
are located in the
module 'data.data_classes'.
All that remains in the original 'data.py' file ('data/main.py') is the basal
data container 'Data'.
The files 'relax', 'prompt/init_data.py', and 'thread_classes.py' have been
modified to import the
correct modules.
Added:
branches/tensor_pdb/data/
branches/tensor_pdb/data/__init__.py
- copied, changed from r2765,
branches/tensor_pdb/generic_fns/__init__.py
branches/tensor_pdb/data/data_classes.py
- copied, changed from r2765, branches/tensor_pdb/data.py
branches/tensor_pdb/data/diff_tensor.py
- copied, changed from r2765, branches/tensor_pdb/data.py
branches/tensor_pdb/data/diff_tensor_auto_objects.py
- copied, changed from r2765, branches/tensor_pdb/data.py
branches/tensor_pdb/data/main.py
- copied, changed from r2765, branches/tensor_pdb/data.py
Modified:
branches/tensor_pdb/prompt/init_data.py
branches/tensor_pdb/relax
branches/tensor_pdb/thread_classes.py
[This mail would be too long, it was shortened to contain the URLs only.]
Copied: branches/tensor_pdb/data/__init__.py (from r2765,
branches/tensor_pdb/generic_fns/__init__.py)
URL:
http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/data/__init__.py?p2=branches/tensor_pdb/data/__init__.py&p1=branches/tensor_pdb/generic_fns/__init__.py&r1=2765&r2=2772&rev=2772&view=diff
Copied: branches/tensor_pdb/data/data_classes.py (from r2765,
branches/tensor_pdb/data.py)
URL:
http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/data/data_classes.py?p2=branches/tensor_pdb/data/data_classes.py&p1=branches/tensor_pdb/data.py&r1=2765&r2=2772&rev=2772&view=diff
Copied: branches/tensor_pdb/data/diff_tensor.py (from r2765,
branches/tensor_pdb/data.py)
URL:
http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/data/diff_tensor.py?p2=branches/tensor_pdb/data/diff_tensor.py&p1=branches/tensor_pdb/data.py&r1=2765&r2=2772&rev=2772&view=diff
Copied: branches/tensor_pdb/data/diff_tensor_auto_objects.py (from r2765,
branches/tensor_pdb/data.py)
URL:
http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/data/diff_tensor_auto_objects.py?p2=branches/tensor_pdb/data/diff_tensor_auto_objects.py&p1=branches/tensor_pdb/data.py&r1=2765&r2=2772&rev=2772&view=diff
Copied: branches/tensor_pdb/data/main.py (from r2765,
branches/tensor_pdb/data.py)
URL:
http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/data/main.py?p2=branches/tensor_pdb/data/main.py&p1=branches/tensor_pdb/data.py&r1=2765&r2=2772&rev=2772&view=diff
Modified: branches/tensor_pdb/prompt/init_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/prompt/init_data.py?rev=2772&r1=2771&r2=2772&view=diff
Modified: branches/tensor_pdb/relax
URL:
http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/relax?rev=2772&r1=2771&r2=2772&view=diff
Modified: branches/tensor_pdb/thread_classes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/thread_classes.py?rev=2772&r1=2771&r2=2772&view=diff
r2772 - in /branches/tensor_pdb: ./ data/ prompt/