Author: bugman
Date: Tue Oct 13 14:22:31 2009
New Revision: 9750
URL: http://svn.gna.org/viewcvs/relax?rev=9750&view=rev
Log:
Set up the NMR-STAR v3.2 model_free saveframe.
Added:
branches/bmrb/bmrblib/thermodynamics/model_free_v3_2.py
- copied, changed from r9749,
branches/bmrb/bmrblib/thermodynamics/model_free_v3_1.py
Modified:
branches/bmrb/bmrblib/nmr_star_dict_v3_2.py
branches/bmrb/bmrblib/thermodynamics/model_free.py
branches/bmrb/bmrblib/thermodynamics/model_free_v3_1.py
Modified: branches/bmrb/bmrblib/nmr_star_dict_v3_2.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/nmr_star_dict_v3_2.py?rev=9750&r1=9749&r2=9750&view=diff
==============================================================================
--- branches/bmrb/bmrblib/nmr_star_dict_v3_2.py (original)
+++ branches/bmrb/bmrblib/nmr_star_dict_v3_2.py Tue Oct 13 14:22:31 2009
@@ -32,7 +32,7 @@
from bmrblib.experimental_details.software import SoftwareSaveframe
from bmrblib.kinetics.relaxation import Relaxation_v3_2
from bmrblib.NMR_parameters.chem_shift_anisotropy_v3_1 import
ChemShiftAnisotropySaveframe_v3_1
-from bmrblib.thermodynamics.model_free_v3_1 import ModelFreeSaveframe_v3_1
+from bmrblib.thermodynamics.model_free_v3_2 import ModelFreeSaveframe_v3_2
from bmrblib.nmr_star_dict import NMR_STAR
@@ -59,4 +59,4 @@
self.relaxation = Relaxation_v3_2(self.data.datanodes)
# Initialise Supergroup 7 : The thermodynamics saveframe API.
- self.model_free = ModelFreeSaveframe_v3_1(self.data.datanodes)
+ self.model_free = ModelFreeSaveframe_v3_2(self.data.datanodes)
Modified: branches/bmrb/bmrblib/thermodynamics/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/thermodynamics/model_free.py?rev=9750&r1=9749&r2=9750&view=diff
==============================================================================
--- branches/bmrb/bmrblib/thermodynamics/model_free.py (original)
+++ branches/bmrb/bmrblib/thermodynamics/model_free.py Tue Oct 13 14:22:31
2009
@@ -21,7 +21,7 @@
###############################################################################
# Module docstring.
-"""The order parameter saveframe category.
+"""The model_free saveframe category (used to be called order_parameters).
For example, see
http://www.bmrb.wisc.edu/dictionary/3.1html_frame/frame_SaveFramePage.html#order_parameters
"""
@@ -153,10 +153,10 @@
self.frame = SaveFrame(title='order_parameters')
# Create the tag categories.
- self.order_parameter_list.create()
- self.order_parameter_experiment.create()
- self.order_parameter_software.create()
- self.order_parameter.create()
+ self.model_free_list.create()
+ self.model_free_experiment.create()
+ self.model_free_software.create()
+ self.model_free.create()
# Add the saveframe to the data nodes.
self.datanodes.append(self.frame)
@@ -166,10 +166,10 @@
"""Create the v3.1 tag categories."""
# The tag category objects.
- self.order_parameter_list = ModelFreeList(self)
- self.order_parameter_experiment = ModelFreeExperiment(self)
- self.order_parameter_software = ModelFreeSoftware(self)
- self.order_parameter = ModelFree(self)
+ self.model_free_list = ModelFreeList(self)
+ self.model_free_experiment = ModelFreeExperiment(self)
+ self.model_free_software = ModelFreeSoftware(self)
+ self.model_free = ModelFree(self)
def specific_setup(self):
Modified: branches/bmrb/bmrblib/thermodynamics/model_free_v3_1.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/thermodynamics/model_free_v3_1.py?rev=9750&r1=9749&r2=9750&view=diff
==============================================================================
--- branches/bmrb/bmrblib/thermodynamics/model_free_v3_1.py (original)
+++ branches/bmrb/bmrblib/thermodynamics/model_free_v3_1.py Tue Oct 13
14:22:31 2009
@@ -27,25 +27,25 @@
"""
# relax module imports.
-from bmrblib.thermodynamics.order_parameters import ModelFreeSaveframe,
ModelFreeList, ModelFreeExperiment, ModelFreeSoftware, ModelFree
+from bmrblib.thermodynamics.model_free import ModelFreeSaveframe,
ModelFreeList, ModelFreeExperiment, ModelFreeSoftware, ModelFree
class ModelFreeSaveframe_v3_1(ModelFreeSaveframe):
- """The v3.1 Order parameters data saveframe class."""
+ """The v3.1 Model_free data saveframe class."""
def add_tag_categories(self):
"""Create the v3.1 tag categories."""
# The tag category objects.
- self.order_parameter_list = ModelFreeList_v3_1(self)
- self.order_parameter_experiment = ModelFreeExperiment_v3_1(self)
- self.order_parameter_software = ModelFreeSoftware_v3_1(self)
- self.order_parameter = ModelFree_v3_1(self)
+ self.model_free_list = ModelFreeList_v3_1(self)
+ self.model_free_experiment = ModelFreeExperiment_v3_1(self)
+ self.model_free_software = ModelFreeSoftware_v3_1(self)
+ self.model_free = ModelFree_v3_1(self)
def specific_setup(self):
"""Method called by self.add() to set up any version specific
data."""
- self.cat_name = ['order_parameters']
+ self.cat_name = ['model_free']
class ModelFreeList_v3_1(ModelFreeList):
Copied: branches/bmrb/bmrblib/thermodynamics/model_free_v3_2.py (from r9749,
branches/bmrb/bmrblib/thermodynamics/model_free_v3_1.py)
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/thermodynamics/model_free_v3_2.py?p2=branches/bmrb/bmrblib/thermodynamics/model_free_v3_2.py&p1=branches/bmrb/bmrblib/thermodynamics/model_free_v3_1.py&r1=9749&r2=9750&rev=9750&view=diff
==============================================================================
--- branches/bmrb/bmrblib/thermodynamics/model_free_v3_1.py (original)
+++ branches/bmrb/bmrblib/thermodynamics/model_free_v3_2.py Tue Oct 13
14:22:31 2009
@@ -21,39 +21,39 @@
###############################################################################
# Module docstring.
-"""The v3.1 Heteronuclear NOE data saveframe category.
+"""The v3.2 Heteronuclear NOE data saveframe category.
-See
http://www.bmrb.wisc.edu/dictionary/3.1html/SaveFramePage.html#heteronucl_NOEs.
+See
http://www.bmrb.wisc.edu/dictionary/3.2html/SaveFramePage.html#heteronucl_NOEs.
"""
# relax module imports.
-from bmrblib.thermodynamics.order_parameters import ModelFreeSaveframe,
ModelFreeList, ModelFreeExperiment, ModelFreeSoftware, ModelFree
+from bmrblib.thermodynamics.model_free_v3_1 import ModelFreeSaveframe_v3_1,
ModelFreeList_v3_1, ModelFreeExperiment_v3_1, ModelFreeSoftware_v3_1,
ModelFree_v3_1
-class ModelFreeSaveframe_v3_1(ModelFreeSaveframe):
- """The v3.1 Order parameters data saveframe class."""
+class ModelFreeSaveframe_v3_2(ModelFreeSaveframe_v3_1):
+ """The v3.2 Model_free data saveframe class."""
def add_tag_categories(self):
- """Create the v3.1 tag categories."""
+ """Create the v3.2 tag categories."""
# The tag category objects.
- self.order_parameter_list = ModelFreeList_v3_1(self)
- self.order_parameter_experiment = ModelFreeExperiment_v3_1(self)
- self.order_parameter_software = ModelFreeSoftware_v3_1(self)
- self.order_parameter = ModelFree_v3_1(self)
+ self.model_free_list = ModelFreeList_v3_2(self)
+ self.model_free_experiment = ModelFreeExperiment_v3_2(self)
+ self.model_free_software = ModelFreeSoftware_v3_2(self)
+ self.model_free = ModelFree_v3_2(self)
def specific_setup(self):
"""Method called by self.add() to set up any version specific
data."""
- self.cat_name = ['order_parameters']
+ self.cat_name = ['model_free']
-class ModelFreeList_v3_1(ModelFreeList):
- """v3.1 ModelFreeList tag category."""
+class ModelFreeList_v3_2(ModelFreeList_v3_1):
+ """v3.2 ModelFreeList tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
# Execute the base class tag_setup() method.
- ModelFreeList.tag_setup(self,
tag_category_label='Order_parameter_list', sep=sep)
+ ModelFreeList_v3_1.tag_setup(self,
tag_category_label='Model_free_list', sep=sep)
# Tag names for the relaxation data.
self.tag_names['SfCategory'] = 'Sf_category'
@@ -61,28 +61,28 @@
self.tag_names['SampleConditionListLabel'] =
'Sample_condition_list_label'
-class ModelFreeExperiment_v3_1(ModelFreeExperiment):
- """v3.1 ModelFreeExperiment tag category."""
+class ModelFreeExperiment_v3_2(ModelFreeExperiment_v3_1):
+ """v3.2 ModelFreeExperiment tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
# Execute the base class tag_setup() method.
- ModelFreeExperiment.tag_setup(self,
tag_category_label='Order_parameter_experiment', sep=sep)
+ ModelFreeExperiment_v3_1.tag_setup(self,
tag_category_label='Model_free_experiment', sep=sep)
-class ModelFreeSoftware_v3_1(ModelFreeSoftware):
- """v3.1 ModelFreeSoftware tag category."""
+class ModelFreeSoftware_v3_2(ModelFreeSoftware_v3_1):
+ """v3.2 ModelFreeSoftware tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
# Execute the base class tag_setup() method.
- ModelFreeSoftware.tag_setup(self,
tag_category_label='Order_parameter_software', sep=sep)
+ ModelFreeSoftware_v3_1.tag_setup(self,
tag_category_label='Model_free_software', sep=sep)
-class ModelFree_v3_1(ModelFree):
- """v3.1 ModelFree tag category."""
+class ModelFree_v3_2(ModelFree_v3_1):
+ """v3.2 ModelFree tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
# Execute the base class tag_setup() method.
- ModelFree.tag_setup(self, tag_category_label='Order_param', sep=sep)
+ ModelFree_v3_1.tag_setup(self, tag_category_label='Mode_free',
sep=sep)
# Tag names for the relaxation data.
self.tag_names['ModelFreeID'] = 'ID'
r9750 - in /branches/bmrb/bmrblib: ./ thermodynamics/