r8853 - in /branches/bmrb/bmrblib: kinetics/heteronucl_NOEs_v3_1.py nmr_star_dict_v3_1.py -- February 22, 2009 - 15:38

Author: bugman
Date: Sun Feb 22 15:37:57 2009
New Revision: 8853

URL: http://svn.gna.org/viewcvs/relax?rev=8853&view=rev
Log:
Some class name changes.


Modified:
    branches/bmrb/bmrblib/kinetics/heteronucl_NOEs_v3_1.py
    branches/bmrb/bmrblib/nmr_star_dict_v3_1.py

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=8853&r1=8852&r2=8853&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/heteronucl_NOEs_v3_1.py (original)
+++ branches/bmrb/bmrblib/kinetics/heteronucl_NOEs_v3_1.py Sun Feb 22 
15:37:57 2009
@@ -21,30 +21,24 @@
 
###############################################################################
 
 # Module docstring.
-"""The Heteronuclear NOE data saveframe category.
+"""The v3.1 Heteronuclear NOE data saveframe category.
 
-For example, see 
http://www.bmrb.wisc.edu/dictionary/3.1html/SaveFramePage.html#heteronucl_NOEs.
+See 
http://www.bmrb.wisc.edu/dictionary/3.1html/SaveFramePage.html#heteronucl_NOEs.
 """
 
 # relax module imports.
-from bmrblib.kinetics.heteronucl_NOEs import HeteronuclNOESaveframe, 
HeteronuclNOEList, HeteronuclNOEExperiment, HeteronuclNOESoftware, 
HeteronuclNOE
+from bmrblib.kinetics.heteronucl_NOEs import HeteronuclNOESaveframe as 
HeteronuclNOESaveframeBase
+from bmrblib.kinetics.heteronucl_NOEs import HeteronuclNOEList as 
HeteronuclNOEListBase
+from bmrblib.kinetics.heteronucl_NOEs import HeteronuclNOEExperiment as 
HeteronuclNOEExperimentBase
+from bmrblib.kinetics.heteronucl_NOEs import HeteronuclNOESoftware as 
HeteronuclNOESoftwareBase
+from bmrblib.kinetics.heteronucl_NOEs import HeteronuclNOE as 
HeteronuclNOEBase
 
 
-class HeteronuclNOESaveframe_v3_1(HeteronuclNOESaveframe):
+class HeteronuclNOESaveframe(HeteronuclNOESaveframeBase):
     """The v3.1 Heteronuclear NOE data saveframe class."""
 
 
-    def add_tag_categories(self):
-        """Create the v3.1 tag categories."""
-
-        # The tag category objects.
-        self.heteronuclNOElist = HeteronuclNOEList_v3_1(self)
-        self.heteronuclNOEexperiment = HeteronuclNOEExperiment_v3_1(self)
-        self.heteronuclNOEsoftware = HeteronuclNOESoftware_v3_1(self)
-        self.heteronuclNOE = HeteronuclNOE_v3_1(self)
-
-
-class HeteronuclNOEList_v3_1(HeteronuclNOEList):
+class HeteronuclNOEList(HeteronuclNOEListBase):
     """v3.1 HeteronuclNOEList tag category."""
 
     # Tag names for the relaxation data.
@@ -64,17 +58,17 @@
         TagCategory.__init__(self, sf, 
tag_category_label='_Heteronucl_T2_list')
 
 
-class HeteronuclNOEExperiment_v3_1(HeteronuclNOEExperiment):
+class HeteronuclNOEExperiment(HeteronuclNOEExperimentBase):
     """v3.1 HeteronuclNOEExperiment tag category."""
 
     # Tag names for experiment setup.
-    SampleLabel = '_Sample_label'
+    SampleLabel = 'Sample_label'
 
 
-class HeteronuclNOESoftware_v3_1(HeteronuclNOESoftware):
+class HeteronuclNOESoftware(HeteronuclNOESoftwareBase):
     """v3.1 HeteronuclNOESoftware tag category."""
 
 
-class HeteronuclNOE_v3_1(HeteronuclNOE):
+class HeteronuclNOE(HeteronuclNOEBase):
     """v3.1 HeteronuclNOE tag category."""
 

Modified: branches/bmrb/bmrblib/nmr_star_dict_v3_1.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/nmr_star_dict_v3_1.py?rev=8853&r1=8852&r2=8853&view=diff
==============================================================================
--- branches/bmrb/bmrblib/nmr_star_dict_v3_1.py (original)
+++ branches/bmrb/bmrblib/nmr_star_dict_v3_1.py Sun Feb 22 15:37:57 2009
@@ -28,9 +28,9 @@
 """
 
 # relax module imports.
-from bmrblib.kinetics.heteronucl_NOEs_v3_1 import 
HeteronuclNOESaveframe_v3_1 as HeteronuclNOESaveframe
-#from bmrblib.kinetics.heteronucl_T1_relaxation_v3_1 import 
HeteronuclT1Saveframe_v3_1 as HeteronuclT1Saveframe
-#from bmrblib.kinetics.heteronucl_T2_relaxation_v3_1 import 
HeteronuclT2Saveframe_v3_1 as HeteronuclT2Saveframe
+from bmrblib.kinetics.heteronucl_NOEs_v3_1 import HeteronuclNOESaveframe
+#from bmrblib.kinetics.heteronucl_T1_relaxation_v3_1 import 
HeteronuclT1Saveframe
+#from bmrblib.kinetics.heteronucl_T2_relaxation_v3_1 import 
HeteronuclT2Saveframe
 from bmrblib.nmr_star_dict import NMR_STAR