The command used was:
svn merge -r8489:8490 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
.....
r8490 | semor | 2009-01-15 19:58:07 +0100 (Thu, 15 Jan 2009) | 13 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
Corrected the way the scaling matrix is assembled.
This is as proposed by Ed in a post at:
https://mail.gna.org/public/relax-devel/2009-01/msg00079.html
(Message-id: <7f080ed10901130637k34ce0fc1l57091178e09940a8@...>)
The scaling values are now based on the default values for the different parameters which were
slightly modified.
The only parameter for which the average is still used (as for intensities in the 'relax_fit.py'
code) is 'R2eff'.
.....