Author: bugman
Date: Tue Oct 13 14:32:31 2009
New Revision: 9751
URL: http://svn.gna.org/viewcvs/relax?rev=9751&view=rev
Log:
The v3.2 model_free saveframe is now correctly created.
Modified:
branches/bmrb/bmrblib/kinetics/general_relaxation.py
branches/bmrb/bmrblib/thermodynamics/model_free.py
branches/bmrb/bmrblib/thermodynamics/model_free_v3_1.py
branches/bmrb/bmrblib/thermodynamics/model_free_v3_2.py
Modified: branches/bmrb/bmrblib/kinetics/general_relaxation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/general_relaxation.py?rev=9751&r1=9750&r2=9751&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/general_relaxation.py (original)
+++ branches/bmrb/bmrblib/kinetics/general_relaxation.py Tue Oct 13 14:32:31
2009
@@ -39,7 +39,6 @@
# Saveframe variables.
label = 'general'
-
def __init__(self, datanodes):
"""Initialise the class, placing the pystarlib data nodes into the
namespace.
Modified: branches/bmrb/bmrblib/thermodynamics/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/thermodynamics/model_free.py?rev=9751&r1=9750&r2=9751&view=diff
==============================================================================
--- branches/bmrb/bmrblib/thermodynamics/model_free.py (original)
+++ branches/bmrb/bmrblib/thermodynamics/model_free.py Tue Oct 13 14:32:31
2009
@@ -35,6 +35,9 @@
class ModelFreeSaveframe(BaseSaveframe):
"""The Order parameters saveframe class."""
+
+ # Saveframe variables.
+ title = 'order_parameters'
def __init__(self, datanodes):
"""Initialise the class, placing the pystarlib data nodes into the
namespace.
@@ -150,7 +153,7 @@
self.generate_data_ids(N)
# Initialise the save frame.
- self.frame = SaveFrame(title='order_parameters')
+ self.frame = SaveFrame(title=self.title)
# Create the tag categories.
self.model_free_list.create()
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=9751&r1=9750&r2=9751&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:32:31 2009
@@ -52,8 +52,20 @@
"""v3.1 ModelFreeList tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
+ """Replacement method for setting up the tag names.
+
+ @keyword tag_category_label: The tag name prefix specific for the
tag category.
+ @type tag_category_label: None or str
+ @keyword sep: The string separating the tag name
prefix and suffix.
+ @type sep: str
+ """
+
+ # Category label.
+ if not tag_category_label:
+ tag_category_label='Order_parameter_list'
+
# Execute the base class tag_setup() method.
- ModelFreeList.tag_setup(self,
tag_category_label='Order_parameter_list', sep=sep)
+ ModelFreeList.tag_setup(self, tag_category_label=tag_category_label,
sep=sep)
# Tag names for the relaxation data.
self.tag_names['SfCategory'] = 'Sf_category'
@@ -65,24 +77,60 @@
"""v3.1 ModelFreeExperiment tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
+ """Replacement method for setting up the tag names.
+
+ @keyword tag_category_label: The tag name prefix specific for the
tag category.
+ @type tag_category_label: None or str
+ @keyword sep: The string separating the tag name
prefix and suffix.
+ @type sep: str
+ """
+
+ # Category label.
+ if not tag_category_label:
+ tag_category_label='Order_parameter_experiment'
+
# Execute the base class tag_setup() method.
- ModelFreeExperiment.tag_setup(self,
tag_category_label='Order_parameter_experiment', sep=sep)
+ ModelFreeExperiment.tag_setup(self,
tag_category_label=tag_category_label, sep=sep)
class ModelFreeSoftware_v3_1(ModelFreeSoftware):
"""v3.1 ModelFreeSoftware tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
+ """Replacement method for setting up the tag names.
+
+ @keyword tag_category_label: The tag name prefix specific for the
tag category.
+ @type tag_category_label: None or str
+ @keyword sep: The string separating the tag name
prefix and suffix.
+ @type sep: str
+ """
+
+ # Category label.
+ if not tag_category_label:
+ tag_category_label='Order_parameter_software'
+
# Execute the base class tag_setup() method.
- ModelFreeSoftware.tag_setup(self,
tag_category_label='Order_parameter_software', sep=sep)
+ ModelFreeSoftware.tag_setup(self,
tag_category_label=tag_category_label, sep=sep)
class ModelFree_v3_1(ModelFree):
"""v3.1 ModelFree tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
+ """Replacement method for setting up the tag names.
+
+ @keyword tag_category_label: The tag name prefix specific for the
tag category.
+ @type tag_category_label: None or str
+ @keyword sep: The string separating the tag name
prefix and suffix.
+ @type sep: str
+ """
+
+ # Category label.
+ if not tag_category_label:
+ tag_category_label='Order_param'
+
# Execute the base class tag_setup() method.
- ModelFree.tag_setup(self, tag_category_label='Order_param', sep=sep)
+ ModelFree.tag_setup(self, tag_category_label=tag_category_label,
sep=sep)
# Tag names for the relaxation data.
self.tag_names['ModelFreeID'] = 'ID'
Modified: branches/bmrb/bmrblib/thermodynamics/model_free_v3_2.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/thermodynamics/model_free_v3_2.py?rev=9751&r1=9750&r2=9751&view=diff
==============================================================================
--- branches/bmrb/bmrblib/thermodynamics/model_free_v3_2.py (original)
+++ branches/bmrb/bmrblib/thermodynamics/model_free_v3_2.py Tue Oct 13
14:32:31 2009
@@ -33,6 +33,9 @@
class ModelFreeSaveframe_v3_2(ModelFreeSaveframe_v3_1):
"""The v3.2 Model_free data saveframe class."""
+ # Saveframe variables.
+ title = 'model_free'
+
def add_tag_categories(self):
"""Create the v3.2 tag categories."""
@@ -52,8 +55,20 @@
"""v3.2 ModelFreeList tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
+ """Replacement method for setting up the tag names.
+
+ @keyword tag_category_label: The tag name prefix specific for the
tag category.
+ @type tag_category_label: None or str
+ @keyword sep: The string separating the tag name
prefix and suffix.
+ @type sep: str
+ """
+
+ # Category label.
+ if not tag_category_label:
+ tag_category_label='Model_free_list'
+
# Execute the base class tag_setup() method.
- ModelFreeList_v3_1.tag_setup(self,
tag_category_label='Model_free_list', sep=sep)
+ ModelFreeList_v3_1.tag_setup(self,
tag_category_label=tag_category_label, sep=sep)
# Tag names for the relaxation data.
self.tag_names['SfCategory'] = 'Sf_category'
@@ -65,24 +80,60 @@
"""v3.2 ModelFreeExperiment tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
+ """Replacement method for setting up the tag names.
+
+ @keyword tag_category_label: The tag name prefix specific for the
tag category.
+ @type tag_category_label: None or str
+ @keyword sep: The string separating the tag name
prefix and suffix.
+ @type sep: str
+ """
+
+ # Category label.
+ if not tag_category_label:
+ tag_category_label='Model_free_experiment'
+
# Execute the base class tag_setup() method.
- ModelFreeExperiment_v3_1.tag_setup(self,
tag_category_label='Model_free_experiment', sep=sep)
+ ModelFreeExperiment_v3_1.tag_setup(self,
tag_category_label=tag_category_label, sep=sep)
class ModelFreeSoftware_v3_2(ModelFreeSoftware_v3_1):
"""v3.2 ModelFreeSoftware tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
+ """Replacement method for setting up the tag names.
+
+ @keyword tag_category_label: The tag name prefix specific for the
tag category.
+ @type tag_category_label: None or str
+ @keyword sep: The string separating the tag name
prefix and suffix.
+ @type sep: str
+ """
+
+ # Category label.
+ if not tag_category_label:
+ tag_category_label='Model_free_software'
+
# Execute the base class tag_setup() method.
- ModelFreeSoftware_v3_1.tag_setup(self,
tag_category_label='Model_free_software', sep=sep)
+ ModelFreeSoftware_v3_1.tag_setup(self,
tag_category_label=tag_category_label, sep=sep)
class ModelFree_v3_2(ModelFree_v3_1):
"""v3.2 ModelFree tag category."""
def tag_setup(self, tag_category_label=None, sep=None):
+ """Replacement method for setting up the tag names.
+
+ @keyword tag_category_label: The tag name prefix specific for the
tag category.
+ @type tag_category_label: None or str
+ @keyword sep: The string separating the tag name
prefix and suffix.
+ @type sep: str
+ """
+
+ # Category label.
+ if not tag_category_label:
+ tag_category_label='Model_free'
+
# Execute the base class tag_setup() method.
- ModelFree_v3_1.tag_setup(self, tag_category_label='Mode_free',
sep=sep)
+ ModelFree_v3_1.tag_setup(self,
tag_category_label=tag_category_label, sep=sep)
# Tag names for the relaxation data.
self.tag_names['ModelFreeID'] = 'ID'
r9751 - in /branches/bmrb/bmrblib: kinetics/ thermodynamics/