Author: bugman
Date: Thu Mar 5 16:23:56 2009
New Revision: 8908
URL: http://svn.gna.org/viewcvs/relax?rev=8908&view=rev
Log:
Simplified the tag name access.
Now the full tag names (category label + sep + tag name) is being generated
by TagCategory.__init__()
so that TagCategory.create_tag_label() doesn't need to be called by the
specific saveframes.
Modified:
branches/bmrb/bmrblib/assembly_supercategory/entity.py
branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py
branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation.py
branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation.py
branches/bmrb/bmrblib/tag_category.py
Modified: branches/bmrb/bmrblib/assembly_supercategory/entity.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/assembly_supercategory/entity.py?rev=8908&r1=8907&r2=8908&view=diff
==============================================================================
--- branches/bmrb/bmrblib/assembly_supercategory/entity.py (original)
+++ branches/bmrb/bmrblib/assembly_supercategory/entity.py Thu Mar 5
16:23:56 2009
@@ -142,16 +142,16 @@
"""Create the Entity tag category."""
# The save frame category.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SfCategory'])],
tagvalues=[['entity']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SfCategory']], tagvalues=[['entity']]))
# The entity ID.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['EntityID'])],
tagvalues=[[str(self.sf.entity_num)]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['EntityID']],
tagvalues=[[str(self.sf.entity_num)]]))
# The entity name.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['Name'])],
tagvalues=[[self.sf.mol_name]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['Name']], tagvalues=[[self.sf.mol_name]]))
# The entity type.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['Type'])],
tagvalues=[[self.sf.mol_type]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['Type']], tagvalues=[[self.sf.mol_type]]))
def read(self, tagtable):
@@ -164,8 +164,8 @@
"""
# The entity info.
- mol_name =
tagtable.tagvalues[tagtable.tagnames.index(self.create_tag_label(self.tag_names['Name']))][0]
- mol_type =
tagtable.tagvalues[tagtable.tagnames.index(self.create_tag_label(self.tag_names['Type']))][0]
+ mol_name =
tagtable.tagvalues[tagtable.tagnames.index(self.tag_names_full['Name'])][0]
+ mol_type =
tagtable.tagvalues[tagtable.tagnames.index(self.tag_names_full['Type'])][0]
# Return the data.
return mol_name, mol_type
@@ -203,7 +203,7 @@
if not self.tag_names.has_key(key):
missing.append(key)
else:
- tag_names.append(self.create_tag_label(self.tag_names[key]))
+ tag_names.append(self.tag_names_full[key])
# The tag values.
tag_values = []
@@ -231,8 +231,8 @@
"""
# The entity info.
- res_nums =
tagtable.tagvalues[tagtable.tagnames.index(self.create_tag_label(self.tag_names['EntityCompIndexID']))]
- res_names =
tagtable.tagvalues[tagtable.tagnames.index(self.create_tag_label(self.tag_names['CompID']))]
+ res_nums =
tagtable.tagvalues[tagtable.tagnames.index(self.tag_names_full['EntityCompIndexID'])]
+ res_names =
tagtable.tagvalues[tagtable.tagnames.index(self.tag_names_full['CompID'])]
# Convert the residue numbers to ints.
for i in range(len(res_nums)):
Modified: branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py?rev=8908&r1=8907&r2=8908&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py Thu Mar 5 16:23:56 2009
@@ -115,17 +115,17 @@
"""Create the HeteronuclNOEList tag category."""
# The save frame category.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SfCategory'])],
tagvalues=[[self.sf.label+'_relaxation']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SfCategory']],
tagvalues=[[self.sf.label+'_relaxation']]))
# NOE ID number.
if self.tag_names.has_key('HeteronuclNOEListID'):
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['HeteronuclNOEListID'])],
tagvalues=[[str(self.sf.noe_inc)]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['HeteronuclNOEListID']],
tagvalues=[[str(self.sf.noe_inc)]]))
# Sample info.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SampleConditionListLabel'])],
tagvalues=[['$conditions_1']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SampleConditionListLabel']],
tagvalues=[['$conditions_1']]))
# NMR info.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SpectrometerFrequency1H'])],
tagvalues=[[str(self.sf.frq/1e6)]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SpectrometerFrequency1H']],
tagvalues=[[str(self.sf.frq/1e6)]]))
def tag_setup(self, tag_category_label=None, sep=None):
@@ -153,7 +153,7 @@
"""Create the HeteronuclNOEExperiment tag category."""
# Sample info.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SampleLabel'])],
tagvalues=[['$sample_1']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SampleLabel']], tagvalues=[['$sample_1']]))
def tag_setup(self, tag_category_label=None, sep=None):
@@ -192,7 +192,7 @@
if not self.tag_names.has_key(key):
missing.append(key)
else:
- tag_names.append(self.create_tag_label(self.tag_names[key]))
+ tag_names.append(self.tag_names_full[key])
# The tag values.
tag_values = []
Modified: branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation.py?rev=8908&r1=8907&r2=8908&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation.py Thu Mar 5
16:23:56 2009
@@ -115,19 +115,19 @@
"""Create the HeteronuclT1List tag category."""
# The save frame category.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SfCategory'])],
tagvalues=[[self.sf.label+'_relaxation']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SfCategory']],
tagvalues=[[self.sf.label+'_relaxation']]))
# T1 ID number.
if self.tag_names.has_key('HeteronuclT1ListID'):
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['HeteronuclT1ListID'])],
tagvalues=[[str(self.sf.r1_inc)]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['HeteronuclT1ListID']],
tagvalues=[[str(self.sf.r1_inc)]]))
# Sample info.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SampleConditionListLabel'])],
tagvalues=[['$conditions_1']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SampleConditionListLabel']],
tagvalues=[['$conditions_1']]))
# NMR info.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SpectrometerFrequency1H'])],
tagvalues=[[str(self.sf.frq/1e6)]]))
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['T1CoherenceType'])],
tagvalues=[[self.variables['coherence']]]))
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['T1ValUnits'])],
tagvalues=[['1/s']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SpectrometerFrequency1H']],
tagvalues=[[str(self.sf.frq/1e6)]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['T1CoherenceType']],
tagvalues=[[self.variables['coherence']]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['T1ValUnits']], tagvalues=[['1/s']]))
def tag_setup(self, tag_category_label=None, sep=None):
@@ -161,7 +161,7 @@
"""Create the HeteronuclT1Experiment tag category."""
# Sample info.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SampleLabel'])],
tagvalues=[['$sample_1']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SampleLabel']], tagvalues=[['$sample_1']]))
def tag_setup(self, tag_category_label=None, sep=None):
@@ -200,7 +200,7 @@
if not self.tag_names.has_key(key):
missing.append(key)
else:
- tag_names.append(self.create_tag_label(self.tag_names[key]))
+ tag_names.append(self.tag_names_full[key])
# The tag values.
tag_values = []
Modified: branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation.py?rev=8908&r1=8907&r2=8908&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation.py Thu Mar 5
16:23:56 2009
@@ -116,19 +116,19 @@
"""Create the HeteronuclT2List tag category."""
# The save frame category.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SfCategory'])],
tagvalues=[[self.sf.label+'_relaxation']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SfCategory']],
tagvalues=[[self.sf.label+'_relaxation']]))
# T2 ID number.
if self.tag_names.has_key('HeteronuclT2ListID'):
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['HeteronuclT2ListID'])],
tagvalues=[[str(self.sf.r2_inc)]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['HeteronuclT2ListID']],
tagvalues=[[str(self.sf.r2_inc)]]))
# Sample info.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SampleConditionListLabel'])],
tagvalues=[['$conditions_1']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SampleConditionListLabel']],
tagvalues=[['$conditions_1']]))
# NMR info.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SpectrometerFrequency1H'])],
tagvalues=[[str(self.sf.frq/1e6)]]))
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['T2CoherenceType'])],
tagvalues=[[self.variables['coherence']]]))
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['T2ValUnits'])],
tagvalues=[['1/s']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SpectrometerFrequency1H']],
tagvalues=[[str(self.sf.frq/1e6)]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['T2CoherenceType']],
tagvalues=[[self.variables['coherence']]]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['T2ValUnits']], tagvalues=[['1/s']]))
def tag_setup(self, tag_category_label=None, sep=None):
@@ -161,7 +161,7 @@
"""Create the HeteronuclT2Experiment tag category."""
# Sample info.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.create_tag_label(self.tag_names['SampleLabel'])],
tagvalues=[['$sample_1']]))
+ self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SampleLabel']], tagvalues=[['$sample_1']]))
def tag_setup(self, tag_category_label=None, sep=None):
@@ -200,7 +200,7 @@
if not self.tag_names.has_key(key):
missing.append(key)
else:
- tag_names.append(self.create_tag_label(self.tag_names[key]))
+ tag_names.append(self.tag_names_full[key])
# The tag values.
tag_values = []
Modified: branches/bmrb/bmrblib/tag_category.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/tag_category.py?rev=8908&r1=8907&r2=8908&view=diff
==============================================================================
--- branches/bmrb/bmrblib/tag_category.py (original)
+++ branches/bmrb/bmrblib/tag_category.py Thu Mar 5 16:23:56 2009
@@ -36,8 +36,19 @@
# Place the saveframe and tag info into the namespace.
self.sf = sf
+ # The tag name dictionary.
+ self.tag_names = {}
+ self.tag_names_full = {}
+
+ # The specific variables dictionary.
+ self.variables = {}
+
# Set up the tag information.
self.tag_setup()
+
+ # Generate the full names.
+ for key, name in self.tag_names.iteritems():
+ self.tag_names_full[key] = self.create_tag_label(name)
def create_tag_label(self, tag_name):
@@ -71,9 +82,3 @@
self.tag_category_label_full = '_'
if self.tag_category_label:
self.tag_category_label_full = self.tag_category_label_full +
self.tag_category_label + self.sep
-
- # The tag name dictionary.
- self.tag_names = {}
-
- # The specific variables dictionary.
- self.variables = {}
r8908 - in /branches/bmrb/bmrblib: ./ assembly_supercategory/ kinetics/