Author: bugman Date: Thu Oct 8 19:14:49 2009 New Revision: 9679 URL: http://svn.gna.org/viewcvs/relax?rev=9679&view=rev Log: Added a version 3.2 specific loop() method for the general relaxation 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=9679&r1=9678&r2=9679&view=diff ============================================================================== --- branches/bmrb/bmrblib/kinetics/relaxation.py (original) +++ branches/bmrb/bmrblib/kinetics/relaxation.py Thu Oct 8 19:14:49 2009 @@ -174,3 +174,13 @@ self.__heteronucl_NOEs.add(frq=frq, res_nums=res_nums, res_names=res_names, atom_names=atom_names, isotope=isotope, data=data, errors=errors) + 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 and R2 data. + for data in self.__general_relaxation.loop(): + yield data