Re: r22222 - /trunk/specific_analyses/relax_disp/disp_data.py -- February 20, 2014 - 19:00

That would be a rather simple solution!  Much simpler than what I was
thinking :)  I look forward to seeing if this fixes all the issues.

Cheers,

Edward



On 20 February 2014 18:44, Troels Emtekær Linnet <tlinnet@xxxxxxxxxxxxx> 
wrote:
> Hi Edward.
>
> I found that the main error was the return of the dispersion points
> from the function loop_point().
>
> It seemed that the minimal change would be to add an extra check in
> this function, and this
> extra check should be dependent on the time point.
>
> And hence i modified the loop_point() to take time as an argument, and
> switching the order
> would give me the time point.
>
> Best
> Troels
>
>
> 2014-02-20 18:27 GMT+01:00 Edward d'Auvergne <edward@xxxxxxxxxxxxx>:
> > Hi Troels,
> >
> > Is there a reason for switching the order?  It's useful to have that
> > in the commit message too.  I can see they are switched from the code
> > that was changed, but I cannot see why.
> >
> > Cheers,
> >
> > Edward
> >
> >
> >
> > On 20 February 2014 18:16,  <tlinnet@xxxxxxxxxxxxx> wrote:
> > > Author: tlinnet
> > > Date: Thu Feb 20 18:16:51 2014
> > > New Revision: 22222
> > >
> > > URL: http://svn.gna.org/viewcvs/relax?rev=22222&view=rev
> > > Log:
> > > Switched the looping over time points and dispersion points.
> > >
> > > Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG 
> > > analysis with two fields at two delay times.
> > >
> > > Modified:
> > >     trunk/specific_analyses/relax_disp/disp_data.py
> > >
> > > Modified: trunk/specific_analyses/relax_disp/disp_data.py
> > > URL: 
> > > http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/disp_data.py?rev=22222&r1=22221&r2=22222&view=diff
> > > ==============================================================================
> > > --- trunk/specific_analyses/relax_disp/disp_data.py (original)
> > > +++ trunk/specific_analyses/relax_disp/disp_data.py Thu Feb 20 18:16:51 
> > > 2014
> > > @@ -869,10 +869,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 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):
> > > +                # 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):
> > >                          # Yield the data.
> > >                          if return_indices:
> > >                              yield exp_type, frq, offset, point, time, 
> > > ei, mi, oi, di, ti
> > >
> > >
> > > _______________________________________________
> > > relax (http://www.nmr-relax.com)
> > >
> > > This is the relax-commits mailing list
> > > relax-commits@xxxxxxx
> > >
> > > To unsubscribe from this list, get a password
> > > reminder, or change your subscription options,
> > > visit the list information page at
> > > https://mail.gna.org/listinfo/relax-commits
> >
> > _______________________________________________
> > relax (http://www.nmr-relax.com)
> >
> > This is the relax-devel mailing list
> > relax-devel@xxxxxxx
> >
> > To unsubscribe from this list, get a password
> > reminder, or change your subscription options,
> > visit the list information page at
> > https://mail.gna.org/listinfo/relax-devel