r8892 - in /branches/bmrb/bmrblib/assembly_supercategory: entity.py entity_v3_1.py -- February 27, 2009 - 18:02

Author: bugman
Date: Fri Feb 27 18:02:22 2009
New Revision: 8892

URL: http://svn.gna.org/viewcvs/relax?rev=8892&view=rev
Log:
The EntityCompIndex saveframe is now being created.


Modified:
    branches/bmrb/bmrblib/assembly_supercategory/entity.py
    branches/bmrb/bmrblib/assembly_supercategory/entity_v3_1.py

Modified: branches/bmrb/bmrblib/assembly_supercategory/entity.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/assembly_supercategory/entity.py?rev=8892&r1=8891&r2=8892&view=diff
==============================================================================
--- branches/bmrb/bmrblib/assembly_supercategory/entity.py (original)
+++ branches/bmrb/bmrblib/assembly_supercategory/entity.py Fri Feb 27 
18:02:22 2009
@@ -87,6 +87,7 @@
 
         # Create the tag categories.
         self.entity.create()
+        self.entity_comp_index.create()
 
         # Add the saveframe to the data nodes.
         self.datanodes.append(self.frame)
@@ -97,6 +98,7 @@
 
         # The tag category objects.
         self.entity = Entity(self)
+        self.entity_comp_index = EntityCompIndex(self)
 
 
 class Entity(TagCategory):
@@ -135,3 +137,53 @@
         self.tag_names['EntityID'] = 'ID'
         self.tag_names['Name'] = 'Name'
         self.tag_names['Type'] = 'Type'
+
+
+class EntityCompIndex(TagCategory):
+    """Base class for the EntityCompIndex tag category."""
+
+    def create(self):
+        """Create the Entity tag category."""
+
+        # The tag names.
+        tag_names = []
+        missing = []
+        for key in ['EntityCompIndexID', 'AuthSeqID', 'CompID', 'CompLabel', 
'SfID', 'EntryID', 'EntityID']:
+            if not self.tag_names.has_key(key):
+                missing.append(key)
+            else:
+                tag_names.append(self.create_tag_label(self.tag_names[key]))
+
+        # The tag values.
+        tag_values = []
+        if 'EntityCompIndexID' not in missing:
+            tag_values.append(self.sf.res_nums)
+        if 'CompID' not in missing:
+            tag_values.append(self.sf.res_names)
+        if 'EntityID' not in missing:
+            
tag_values.append([str(self.sf.entity_num)]*len(self.sf.res_nums))
+
+        # Add the data.
+        table = TagTable(tagnames=tag_names, tagvalues=tag_values)
+
+        # Add the tagtable to the save frame.
+        self.sf.frame.tagtables.append(table)
+
+
+    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
+        """
+
+        # Execute the base class tag_setup() method.
+        TagCategory.tag_setup(self, tag_category_label=tag_category_label, 
sep=sep)
+
+        # Tag names for the relaxation data.
+        self.tag_names['EntityCompIndexID'] = 'ID'
+        self.tag_names['CompID'] = 'Comp_ID'
+        self.tag_names['EntityID'] = 'Entity_ID'
+

Modified: branches/bmrb/bmrblib/assembly_supercategory/entity_v3_1.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/assembly_supercategory/entity_v3_1.py?rev=8892&r1=8891&r2=8892&view=diff
==============================================================================
--- branches/bmrb/bmrblib/assembly_supercategory/entity_v3_1.py (original)
+++ branches/bmrb/bmrblib/assembly_supercategory/entity_v3_1.py Fri Feb 27 
18:02:22 2009
@@ -27,7 +27,7 @@
 """
 
 # relax module imports.
-from bmrblib.assembly_supercategory.entity import EntitySaveframe, Entity
+from bmrblib.assembly_supercategory.entity import EntitySaveframe, Entity, 
EntityCompIndex
 
 
 class EntitySaveframe_v3_1(EntitySaveframe):
@@ -38,6 +38,7 @@
 
         # The tag category objects.
         self.entity = Entity_v3_1(self)
+        self.entity_comp_index = EntityCompIndex_v3_1(self)
 
 
 class Entity_v3_1(Entity):
@@ -49,3 +50,13 @@
 
         # Tag names for the relaxation data.
         self.tag_names['SfCategory'] = 'Sf_category'
+
+
+class EntityCompIndex_v3_1(EntityCompIndex):
+    """v3.1 EntityCompIndex tag category."""
+
+    def tag_setup(self, tag_category_label=None, sep=None):
+        # Execute the base class tag_setup() method.
+        EntityCompIndex.tag_setup(self, 
tag_category_label='Entity_comp_index', sep=sep)
+
+