r22257 - in /branches/double_rotor: ./ specific_analyses/relax_disp/disp_data.py -- February 24, 2014 - 09:48

Author: bugman
Date: Mon Feb 24 09:48:30 2014
New Revision: 22257

URL: http://svn.gna.org/viewcvs/relax?rev=22257&view=rev
Log:
Merged revisions 22256 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r22256 | tlinnet | 2014-02-24 09:13:39 +0100 (Mon, 24 Feb 2014) | 6 lines
  
  Reverted the ordering of dispersion point and relaxation time.
  
  Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG 
analysis with two fields at two delay times.
  
  The ordering of the dispersion and relaxation time follow a strict pattern 
as explained in: http://thread.gmane.org/gmane.science.nmr.relax.devel/5070.
  The looping is done over first the dispersion points, before the time 
points.
........

Modified:
    branches/double_rotor/   (props changed)
    branches/double_rotor/specific_analyses/relax_disp/disp_data.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 24 09:48:30 2014
@@ -1,1 +1,1 @@
-/trunk:1-22254
+/trunk:1-22256

Modified: branches/double_rotor/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/disp_data.py?rev=22257&r1=22256&r2=22257&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/double_rotor/specific_analyses/relax_disp/disp_data.py Mon Feb 
24 09:48:30 2014
@@ -870,10 +870,10 @@
         for frq, mi in loop_frq(return_indices=True):
             # Then loop over the offset data.
             for offset, oi in loop_offset(exp_type=exp_type, frq=frq, 
return_indices=True):
-                # Then the relaxation times.
-                for time, ti in loop_time(return_indices=True):
-                    # Finally the dispersion points.
-                    for point, di in loop_point(exp_type=exp_type, frq=frq, 
offset=offset, time=time, return_indices=True):
+                # Then the dispersion points.
+                for point, di in loop_point(exp_type=exp_type, frq=frq, 
offset=offset, return_indices=True):
+                    # Finally the relaxation times.
+                    for time, ti in loop_time(return_indices=True):
                         # Yield the data.
                         if return_indices:
                             yield exp_type, frq, offset, point, time, ei, 
mi, oi, di, ti