Changeset 4f63160 in sasview

Timestamp:

May 8, 2008 7:13:59 PM (17 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

32dffae4

Parents:

34ab06d

Message:

number of peaks as figure of merit

Location:

pr_inversion/c_extensions

Files:

• Cinvertor.c (modified) (2 diffs)
• invertor.c (modified) (1 diff)
• invertor.h (modified) (1 diff)

pr_inversion/c_extensions/Cinvertor.c

@@ -484 +484 @@
         norm   = int_p2(pars, self->params.d_max, npars, 100);
         return Py_BuildValue("f", sqrt(oscill/norm)/acos(-1.0)*self->params.d_max );    
+        
+}
+
+static PyObject * get_peaks(Cinvertor *self, PyObject *args) {
+        double *pars;
+        PyObject *data_obj;
+        Py_ssize_t npars;
+        int count;
+        
+        if (!PyArg_ParseTuple(args, "O", &data_obj)) return NULL;
+        OUTVECTOR(data_obj,pars,npars);
+        
+        count = npeaks(pars, self->params.d_max, npars, 100);
+
+        return Py_BuildValue("i", count );      
         
 }
@@ -509 +524 @@
                    {"basefunc_ft", (PyCFunction)basefunc_ft, METH_VARARGS, ""},
                    {"oscillations", (PyCFunction)oscillations, METH_VARARGS, ""},
+                   {"get_peaks", (PyCFunction)get_peaks, METH_VARARGS, ""},
    
    {NULL}

pr_inversion/c_extensions/invertor.c

@@ -152 +152 @@
 }
 
+/**
+ * Get the number of P(r) peaks.
+ */
+int npeaks(double *pars, double d_max, int n_c, int nslice) {
+    double r; 
+    double value;
+        int i;
+        double previous = 0.0;
+        double slope    = 0.0;
+        int count = 0;
+    for (i=0; i<nslice; i++) {
+        r = d_max/(1.0*nslice)*i;
+        value = pr(pars, d_max, n_c, r);
+        if (previous<=value){
+                //if (slope<0) count += 1;
+                slope = 1;
+        } else {
+                //printf("slope -1");
+                if (slope>0) count += 1;
+                slope = -1;
+        }
+        previous = value;
+    }
+    return count;
+}
+

pr_inversion/c_extensions/invertor.h

@@ -30 +30 @@
 void pr_err(double *pars, double *err, double d_max, int n_c, 
                 double r, double *pr_value, double *pr_value_err);
+int npeaks(double *pars, double d_max, int n_c, int nslice);
+
 #endif