Oh, forget about my previous comment (http://www.mail-archive.com/[email protected]/msg05715.html). This change here is the problem - the original code should work just fine. The problem with the processor.run_queue() method has nothing to do with the specific analyses in relax (http://www.mail-archive.com/[email protected]/msg05710.html), but is within the multi-processor code. Reverting a few commits here might be best.
Cheers, Edward On 20 May 2014 01:47, <[email protected]> wrote: > Author: tlinnet > Date: Tue May 20 01:47:37 2014 > New Revision: 23249 > > URL: http://svn.gna.org/viewcvs/relax?rev=23249&view=rev > Log: > An attempt to fix the pipe_control/minimisy.py minimise() call to > processor.run_queue(). > > It was thought that I was modifying the address of array class(back_calc). > But this does not seem to be the problem. > > Modified: > branches/disp_speed/target_functions/relax_disp.py > > Modified: branches/disp_speed/target_functions/relax_disp.py > URL: > http://svn.gna.org/viewcvs/relax/branches/disp_speed/target_functions/relax_disp.py?rev=23249&r1=23248&r2=23249&view=diff > ============================================================================== > --- branches/disp_speed/target_functions/relax_disp.py (original) > +++ branches/disp_speed/target_functions/relax_disp.py Tue May 20 01:47:37 > 2014 > @@ -484,7 +484,14 @@ > dw_frq = dw[si] * self.frqs[0][si][mi] > > # Back calculate the R2eff values. > - self.back_calc[0][si][mi][0] = > r2eff_CR72(r20a=R20A[r20_index], r20b=R20B[r20_index], pA=pA, dw=dw_frq, > kex=kex, cpmg_frqs=self.cpmg_frqs[0][mi][0], > num_points=self.num_disp_points[0][si][mi][0]) > + r2eff = r2eff_CR72(r20a=R20A[r20_index], > r20b=R20B[r20_index], pA=pA, dw=dw_frq, kex=kex, > cpmg_frqs=self.cpmg_frqs[0][mi][0], > num_points=self.num_disp_points[0][si][mi][0]) > + > + # Now do the fastest way to copy data from array r2eff to > array class(back_calc), without modifying the address of array > class(back_calc). > + # This is to prevent pointer to class object array that > cannot change. Should be equivalent to numpy.copyto (v. 1.7). > + #self.back_calc[0][si][mi][0][:] = r2eff > + # Parse back the value to update the back_calc class object. > + for i in range(num_points): > + self.back_calc[0][si][mi][0][i] = r2eff[i] > > # For all missing data points, set the back-calculated value > to the measured values so that it has no effect on the chi-squared value. > for di in range(self.num_disp_points[0][si][mi][0]): > > > _______________________________________________ > relax (http://www.nmr-relax.com) > > This is the relax-commits mailing list > [email protected] > > 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 [email protected] 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
