Author: bugman
Date: Tue Mar 10 15:15:00 2009
New Revision: 8954
URL: http://svn.gna.org/viewcvs/relax?rev=8954&view=rev
Log:
Shifted all the data ID code into the new BaseSaveframe base class.
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
branches/bmrb/bmrblib/tag_category.py
Modified: branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py?rev=8954&r1=8953&r2=8954&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_NOEs.py Tue Mar 10 15:15:00 2009
@@ -97,9 +97,10 @@
# Set up the NOE specific variables.
self.noe_inc = self.noe_inc + 1
self.rx_inc_list = translate([self.noe_inc] * self.N)
+ self.generate_data_ids(self.N)
# Set up the version specific variables.
- self.specific_setup(N=self.N)
+ self.specific_setup()
# Initialise the save frame.
self.frame =
SaveFrame(title='heteronuclear_'+self.label+'_list_'+`self.noe_inc`)
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=8954&r1=8953&r2=8954&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_NOEs_v3_1.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_NOEs_v3_1.py Tue Mar 10
15:15:00 2009
@@ -44,19 +44,11 @@
self.Rx = HeteronuclNOE_v3_1(self)
- def specific_setup(self, N=0):
- """Method called by self.add() to set up any version specific data.
-
- @keyword N: The number of data points, if relevant.
- @type N: None or int
- """
+ def specific_setup(self):
+ """Method called by self.add() to set up any version specific
data."""
# The category name.
self.cat_name = ['heteronucl_NOEs']
-
- # The data ID values.
- if N != None:
- self.id = translate(range(1,N+1))
class HeteronuclNOEList_v3_1(HeteronuclNOEList):
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=8954&r1=8953&r2=8954&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_T1_relaxation.py Tue Mar 10
15:15:00 2009
@@ -97,9 +97,10 @@
# Set up the R1 specific variables.
self.r1_inc = self.r1_inc + 1
self.rx_inc_list = translate([self.r1_inc] * self.N)
+ self.generate_data_ids(self.N)
# Set up the version specific variables.
- self.specific_setup(N=self.N)
+ self.specific_setup()
# Initialise the save frame.
self.frame =
SaveFrame(title='heteronuclear_'+self.label+'_list_'+`self.r1_inc`)
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=8954&r1=8953&r2=8954&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 15:15:00 2009
@@ -44,19 +44,11 @@
self.Rx = T1_v3_1(self)
- def specific_setup(self, N=0):
- """Method called by self.add() to set up any version specific data.
-
- @keyword N: The number of data points, if relevant.
- @type N: None or int
- """
+ def specific_setup(self):
+ """Method called by self.add() to set up any version specific
data."""
# The category name.
self.cat_name = ['heteronucl_T1_relaxation']
-
- # The data ID values.
- if N != None:
- self.id = translate(range(1,N+1))
class HeteronuclT1List_v3_1(HeteronuclT1List):
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=8954&r1=8953&r2=8954&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_T2_relaxation.py Tue Mar 10
15:15:00 2009
@@ -97,9 +97,10 @@
# Set up the R2 specific variables.
self.r2_inc = self.r2_inc + 1
self.rx_inc_list = translate([self.r2_inc] * self.N)
+ self.generate_data_ids(self.N)
# Set up the version specific variables.
- self.specific_setup(N=self.N)
+ self.specific_setup()
# Initialise the save frame.
self.frame =
SaveFrame(title='heteronuclear_'+self.label+'_list_'+`self.r2_inc`)
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=8954&r1=8953&r2=8954&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 15:15:00 2009
@@ -27,7 +27,6 @@
"""
# relax module imports.
-from bmrblib.misc import translate
from bmrblib.kinetics.heteronucl_T2_relaxation import HeteronuclT2Saveframe,
HeteronuclT2List, HeteronuclT2Experiment, HeteronuclT2Software, T2
@@ -44,19 +43,11 @@
self.Rx = T2_v3_1(self)
- def specific_setup(self, N=0):
- """Method called by self.add() to set up any version specific data.
-
- @keyword N: The number of data points, if relevant.
- @type N: None or int
- """
+ def specific_setup(self):
+ """Method called by self.add() to set up any version specific
data."""
# The category name.
self.cat_name = ['heteronucl_T2_relaxation']
-
- # The data ID values.
- if N != None:
- self.id = translate(range(1,N+1))
class HeteronuclT2List_v3_1(HeteronuclT2List):
Modified: branches/bmrb/bmrblib/kinetics/relax_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/relax_base.py?rev=8954&r1=8953&r2=8954&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/relax_base.py (original)
+++ branches/bmrb/bmrblib/kinetics/relax_base.py Tue Mar 10 15:15:00 2009
@@ -24,10 +24,10 @@
"""Base classes for the relaxation data."""
# relax module imports.
-from bmrblib.tag_category import TagCategory
+from bmrblib.tag_category import BaseSaveframe, TagCategory
-class RelaxSaveframe:
+class RelaxSaveframe(BaseSaveframe):
"""The heteronuclear Rx data saveframe baseclass."""
def loop(self):
@@ -105,7 +105,7 @@
# Keys and objects.
info = [
- ['RxID', 'id'],
+ ['RxID', 'data_ids'],
['CompIndexID', 'res_nums'],
['CompID', 'res_names'],
['AtomID', 'atom_names'],
Modified: branches/bmrb/bmrblib/tag_category.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/tag_category.py?rev=8954&r1=8953&r2=8954&view=diff
==============================================================================
--- branches/bmrb/bmrblib/tag_category.py (original)
+++ branches/bmrb/bmrblib/tag_category.py Tue Mar 10 15:15:00 2009
@@ -24,7 +24,23 @@
"""The TagCategory base class."""
# relax module imports.
+from bmrblib.misc import translate
from pystarlib.TagTable import TagTable
+
+
+class BaseSaveframe:
+ """The base class for the saveframe classes."""
+
+ def generate_data_ids(self, N):
+ """Generate the data ID structure.
+
+ @keyword N: The number of data points.
+ @type N: int
+ """
+
+ # The data ID values.
+ self.data_ids = translate(range(1,N+1))
+
class TagCategory:
r8954 - in /branches/bmrb/bmrblib: ./ kinetics/