Author: semor
Date: Fri Aug 26 11:53:31 2011
New Revision: 14476
URL: http://svn.gna.org/viewcvs/relax?rev=14476&view=rev
Log:
A first trial at passing the "curve_type" to the C code.
However, something is wrong, potentially in the C code (see
compilation warning below) as relax now complains that
"an integer is required" for assignment to "curve_type":
====
maths_fns/relax_fit.c: In function 'setup':
maths_fns/relax_fit.c:66: warning: assignment makes integer from pointer
without a cast
====
Anybody, any idea ?
Modified:
branches/inversion-recovery/specific_fns/relax_fit.py
Modified: branches/inversion-recovery/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/specific_fns/relax_fit.py?rev=14476&r1=14475&r2=14476&view=diff
==============================================================================
--- branches/inversion-recovery/specific_fns/relax_fit.py (original)
+++ branches/inversion-recovery/specific_fns/relax_fit.py Fri Aug 26
11:53:31 2011
@@ -791,7 +791,7 @@
# The relaxation times.
times.append(cdp.relax_times[key])
- setup(num_params=len(spin.params),
num_times=len(cdp.relax_times), values=values, sd=errors,
relax_times=times, scaling_matrix=scaling_matrix.tolist())
+ setup(num_params=len(spin.params),
num_times=len(cdp.relax_times), curve_type=cdp.curve_type, values=values,
sd=errors, relax_times=times, scaling_matrix=scaling_matrix.tolist())
# Setup the minimisation algorithm when constraints are present.
_______________________________________________
relax (http://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