r8967 - in /branches/bmrb/bmrblib/thermodynamics: order_parameters.py order_parameters_v3_1.py -- March 11, 2009 - 15:22

Author: bugman
Date: Wed Mar 11 15:22:06 2009
New Revision: 8967

URL: http://svn.gna.org/viewcvs/relax?rev=8967&view=rev
Log:
Added the ID counter for the Order_param saveframe.


Modified:
    branches/bmrb/bmrblib/thermodynamics/order_parameters.py
    branches/bmrb/bmrblib/thermodynamics/order_parameters_v3_1.py

Modified: branches/bmrb/bmrblib/thermodynamics/order_parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/thermodynamics/order_parameters.py?rev=8967&r1=8966&r2=8967&view=diff
==============================================================================
--- branches/bmrb/bmrblib/thermodynamics/order_parameters.py (original)
+++ branches/bmrb/bmrblib/thermodynamics/order_parameters.py Wed Mar 11 
15:22:06 2009
@@ -27,13 +27,13 @@
 """
 
 # relax module imports.
-from bmrblib.base_classes import TagCategory
+from bmrblib.base_classes import BaseSaveframe, TagCategory
 from bmrblib.misc import no_missing, translate
 from pystarlib.SaveFrame import SaveFrame
 from pystarlib.TagTable import TagTable
 
 
-class OrderParameterSaveframe:
+class OrderParameterSaveframe(BaseSaveframe):
     """The Order parameters data saveframe class."""
 
     def __init__(self, datanodes):
@@ -115,6 +115,9 @@
             # Place the args into the namespace, translating for BMRB.
             setattr(self, name, translate(obj))
 
+        # The ID numbers.
+        self.generate_data_ids(N)
+
         # Initialise the save frame.
         self.frame = SaveFrame(title='order_parameters')
 
@@ -220,6 +223,7 @@
 
         # Keys and objects.
         info = [
+            ['OrderParamID',        'data_ids'],
             ['CompIndexID',         'res_nums'],
             ['CompID',              'res_names'],
             ['AtomID',              'atom_names'],
@@ -259,6 +263,7 @@
         TagCategory.tag_setup(self, tag_category_label=tag_category_label, 
sep=sep)
 
         # Tag names for the relaxation data.
+        self.tag_names['OrderParamID'] = None
         self.tag_names['CompIndexID'] = 'Residue_seq_code'
         self.tag_names['CompID'] = 'Residue_label'
         self.tag_names['AtomID'] = 'Atom_name'

Modified: branches/bmrb/bmrblib/thermodynamics/order_parameters_v3_1.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/thermodynamics/order_parameters_v3_1.py?rev=8967&r1=8966&r2=8967&view=diff
==============================================================================
--- branches/bmrb/bmrblib/thermodynamics/order_parameters_v3_1.py (original)
+++ branches/bmrb/bmrblib/thermodynamics/order_parameters_v3_1.py Wed Mar 11 
15:22:06 2009
@@ -85,6 +85,7 @@
         OrderParameter.tag_setup(self, tag_category_label='Order_param', 
sep=sep)
 
         # Tag names for the relaxation data.
+        self.tag_names['OrderParamID'] = 'ID'
         self.tag_names['CompIndexID'] = 'Comp_index_ID'
         self.tag_names['CompID'] = 'Comp_ID'
         self.tag_names['AtomID'] = 'Atom_ID'