r9678 - /branches/bmrb/bmrblib/kinetics/relaxation.py -- October 08, 2009 - 19:13

Author: bugman
Date: Thu Oct  8 19:13:22 2009
New Revision: 9678

URL: http://svn.gna.org/viewcvs/relax?rev=9678&view=rev
Log:
Wrote the loop() method for the abstracted relaxation data bmrblib API.

This loops over and returns all relaxation data, regardless of saveframe.


Modified:
    branches/bmrb/bmrblib/kinetics/relaxation.py

Modified: branches/bmrb/bmrblib/kinetics/relaxation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/relaxation.py?rev=9678&r1=9677&r2=9678&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/relaxation.py (original)
+++ branches/bmrb/bmrblib/kinetics/relaxation.py Thu Oct  8 19:13:22 2009
@@ -48,6 +48,22 @@
         self.__heteronucl_NOEs = HeteronuclNOESaveframe(datanodes)
         self.__heteronucl_T1_relaxation = HeteronuclT1Saveframe(datanodes)
         self.__heteronucl_T2_relaxation = HeteronuclT2Saveframe(datanodes)
+
+
+    def loop(self):
+        """Generator method for looping over and returning all relaxation 
data."""
+
+        # The NOE data.
+        for frq, res_nums, res_names, spin_names, val, err in 
self.__heteronucl_NOEs.loop():
+            yield "NOE", frq, res_nums, res_names, spin_names, val, err
+
+        # The R1 data.
+        for frq, res_nums, res_names, spin_names, val, err in 
self.__heteronucl_T1_relaxation.loop():
+            yield "R1", frq, res_nums, res_names, spin_names, val, err
+
+        # The R2 data.
+        for frq, res_nums, res_names, spin_names, val, err in 
self.__heteronucl_T2_relaxation.loop():
+            yield "R2", frq, res_nums, res_names, spin_names, val, err
 
 
 class Relaxation_v3_0(Relaxation):