Author: bugman
Date: Tue Mar 10 14:17:38 2009
New Revision: 8950
URL: http://svn.gna.org/viewcvs/relax?rev=8950&view=rev
Log:
Fixed the relaxation saveframe category values to be version specific.
Modified:
branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py
branches/bmrb/bmrblib/kinetics/heteronucl_NOEs_v3_1.py
branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation.py
branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation_v3_1.py
branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation.py
branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation_v3_1.py
branches/bmrb/bmrblib/kinetics/relax_base.py
Modified: branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py?rev=8950&r1=8949&r2=8950&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py Tue Mar 10 14:17:38 2009
@@ -98,6 +98,9 @@
self.noe_inc = self.noe_inc + 1
self.rx_inc_list = translate([self.noe_inc] * self.N)
+ # Set up the version specific variables.
+ self.specific_setup()
+
# Initialise the save frame.
self.frame =
SaveFrame(title='heteronuclear_'+self.label+'_list_'+`self.noe_inc`)
@@ -128,7 +131,7 @@
"""Create the HeteronuclNOEList tag category."""
# The save frame category.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SfCategory']],
tagvalues=[[self.sf.label+'_relaxation']]))
+ self.sf.frame.tagtables.append(self.create_tag_table([['SfCategory',
'cat_name']], free=True))
# NOE ID number.
if self.tag_names.has_key('HeteronuclNOEListID'):
Modified: branches/bmrb/bmrblib/kinetics/heteronucl_NOEs_v3_1.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/heteronucl_NOEs_v3_1.py?rev=8950&r1=8949&r2=8950&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_NOEs_v3_1.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_NOEs_v3_1.py Tue Mar 10
14:17:38 2009
@@ -43,6 +43,12 @@
self.Rx = HeteronuclNOE_v3_1(self)
+ def specific_setup(self):
+ """Method called by self.add() to set up any version specific
data."""
+
+ self.cat_name = ['heteronucl_NOEs']
+
+
class HeteronuclNOEList_v3_1(HeteronuclNOEList):
"""v3.1 HeteronuclNOEList tag category."""
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=8950&r1=8949&r2=8950&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation.py Tue Mar 10
14:17:38 2009
@@ -98,6 +98,9 @@
self.r1_inc = self.r1_inc + 1
self.rx_inc_list = translate([self.r1_inc] * self.N)
+ # Set up the version specific variables.
+ self.specific_setup()
+
# Initialise the save frame.
self.frame =
SaveFrame(title='heteronuclear_'+self.label+'_list_'+`self.r1_inc`)
@@ -121,7 +124,6 @@
self.Rx = T1(self)
-
class HeteronuclT1List(HeteronuclRxList):
"""Base class for the HeteronuclT1List tag category."""
@@ -129,7 +131,7 @@
"""Create the HeteronuclT1List tag category."""
# The save frame category.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SfCategory']],
tagvalues=[[self.sf.label+'_relaxation']]))
+ self.sf.frame.tagtables.append(self.create_tag_table([['SfCategory',
'cat_name']], free=True))
# T1 ID number.
if self.tag_names.has_key('HeteronuclT1ListID'):
Modified: branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation_v3_1.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation_v3_1.py?rev=8950&r1=8949&r2=8950&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation_v3_1.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation_v3_1.py Tue Mar
10 14:17:38 2009
@@ -43,6 +43,12 @@
self.Rx = T1_v3_1(self)
+ def specific_setup(self):
+ """Method called by self.add() to set up any version specific
data."""
+
+ self.cat_name = ['heteronucl_T1_relaxation']
+
+
class HeteronuclT1List_v3_1(HeteronuclT1List):
"""v3.1 HeteronuclT1List tag category."""
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=8950&r1=8949&r2=8950&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation.py Tue Mar 10
14:17:38 2009
@@ -98,6 +98,9 @@
self.r2_inc = self.r2_inc + 1
self.rx_inc_list = translate([self.r2_inc] * self.N)
+ # Set up the version specific variables.
+ self.specific_setup()
+
# Initialise the save frame.
self.frame =
SaveFrame(title='heteronuclear_'+self.label+'_list_'+`self.r2_inc`)
@@ -130,7 +133,7 @@
"""Create the HeteronuclT2List tag category."""
# The save frame category.
- self.sf.frame.tagtables.append(TagTable(free=True,
tagnames=[self.tag_names_full['SfCategory']],
tagvalues=[[self.sf.label+'_relaxation']]))
+ self.sf.frame.tagtables.append(self.create_tag_table([['SfCategory',
'cat_name']], free=True))
# T2 ID number.
if self.tag_names.has_key('HeteronuclT2ListID'):
Modified: branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation_v3_1.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation_v3_1.py?rev=8950&r1=8949&r2=8950&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation_v3_1.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation_v3_1.py Tue Mar
10 14:17:38 2009
@@ -43,6 +43,12 @@
self.Rx = T2_v3_1(self)
+ def specific_setup(self):
+ """Method called by self.add() to set up any version specific
data."""
+
+ self.cat_name = ['heteronucl_T2_relaxation']
+
+
class HeteronuclT2List_v3_1(HeteronuclT2List):
"""v3.1 HeteronuclT2List tag category."""
Modified: branches/bmrb/bmrblib/kinetics/relax_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/relax_base.py?rev=8950&r1=8949&r2=8950&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/relax_base.py (original)
+++ branches/bmrb/bmrblib/kinetics/relax_base.py Tue Mar 10 14:17:38 2009
@@ -63,6 +63,12 @@
# Yield the data.
yield frq, res_nums, res_names, atom_names, values, errors
+
+
+ def specific_setup(self):
+ """Method called by self.add() to set up any version specific
data."""
+
+ self.cat_name = [self.label+'_relaxation']
r8950 - /branches/bmrb/bmrblib/kinetics/