r14469 - /branches/inversion-recovery/maths_fns/relax_fit.c -- August 26, 2011 - 11:02

Author: semor
Date: Fri Aug 26 11:02:13 2011
New Revision: 14469

URL: http://svn.gna.org/viewcvs/relax?rev=14469&view=rev
Log:
Added parsing of the "curve_type" argument.

Not clear if this is needed, but the code compiles.
This, however, does not solve the issue of relax thinking the C module is not 
compiled, 
giving the following error message upon launching:

====
ImportError: 
dlopen(/Users/semor/Documents/pse-4/collaborations/relax/relax-1.3_inversion-recovery/maths_fns/relax_fit.so,
 2): Symbol not found: _curve_type
  Referenced from: 
/Users/semor/Documents/pse-4/collaborations/relax/relax-1.3_inversion-recovery/maths_fns/relax_fit.so
  Expected in: flat namespace
 in 
/Users/semor/Documents/pse-4/collaborations/relax/relax-1.3_inversion-recovery/maths_fns/relax_fit.so
Relaxation curve fitting is unavailable, try compiling the C modules.
====



Modified:
    branches/inversion-recovery/maths_fns/relax_fit.c

Modified: branches/inversion-recovery/maths_fns/relax_fit.c
URL: 
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/maths_fns/relax_fit.c?rev=14469&r1=14468&r2=14469&view=diff
==============================================================================
--- branches/inversion-recovery/maths_fns/relax_fit.c (original)
+++ branches/inversion-recovery/maths_fns/relax_fit.c Fri Aug 26 11:02:13 2011
@@ -116,6 +116,7 @@
      */
 
     /* Declarations */
+    PyObject *curve_type_arg;
     PyObject *params_arg;
     PyObject *element;
     char *curve_type;
@@ -123,7 +124,7 @@
     int i;
 
     /* Parse the function arguments, the only argument should be the 
parameter array */
-    if (!PyArg_ParseTuple(args, "O", &params_arg))
+    if (!PyArg_ParseTuple(args, "O", &params_arg, &curve_type_arg))
         return NULL;
 
     /* Place the parameter array elements into the C array */
@@ -161,7 +162,7 @@
     double *params;
 
     /* Parse the function arguments, the only argument should be the 
parameter array */
-    if (!PyArg_ParseTuple(args, "O", &params_arg))
+    if (!PyArg_ParseTuple(args, "O", &params_arg, &curve_type_arg))
         return NULL;
 
     /* Back calculated the peak intensities */