Changeset 41e8114 in sasview for realSpaceModeling/pointsmodelpy/pointsmodelpymodule

Timestamp:

Nov 2, 2007 11:04:05 AM (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:

5a2070e

Parents:

7e845ea

Message:

Added error estimation for 2D simulation

Location:

realSpaceModeling/pointsmodelpy/pointsmodelpymodule

Files:

• bindings.cc (modified) (1 diff)
• misc.cc (modified) (1 diff)
• misc.h (modified) (1 diff)

realSpaceModeling/pointsmodelpy/pointsmodelpymodule/bindings.cc

@@ -121 +121 @@
         METH_VARARGS, pypointsmodelpy_get_complex_Iqxy__doc__},
 
+        //ComplexModel calculateIQ_2D_Error(pts,Qx,Qy)
+        {pypointsmodelpy_get_complex_Iqxy_err__name__, pypointsmodelpy_get_complex_Iqxy_err,
+         METH_VARARGS, pypointsmodelpy_get_complex_Iqxy_err__doc__},
+
     //ComplexModel calculateIQ
     {pypointsmodelpy_get_complex_iq__name__, pypointsmodelpy_get_complex_iq,

realSpaceModeling/pointsmodelpy/pointsmodelpymodule/misc.cc

@@ -554 +554 @@
 }
 
+//LORESModel method CalculateIQ_2D_Error(points,qx,qy) 
+char pypointsmodelpy_get_complex_Iqxy_err__name__[] = "get_complex_iq_2D_err";
+char pypointsmodelpy_get_complex_Iqxy_err__doc__[] = "calculate averaged scattering intensity from a single q";
+
+PyObject * pypointsmodelpy_get_complex_Iqxy_err(PyObject *, PyObject *args)
+{
+  PyObject *pylores = 0, *pypoint3dvec = 0;
+  double qx = 0, qy = 0;
+  int ok = PyArg_ParseTuple(args, "OOdd", &pylores, &pypoint3dvec, &qx, &qy);
+  if(!ok) return NULL;
+
+  void *temp = PyCObject_AsVoidPtr(pylores);
+  ComplexModel * thiscomplex = static_cast<ComplexModel *>(temp);
+  void *temp2 = PyCObject_AsVoidPtr(pypoint3dvec);
+  vector<Point3D> * thisvec = static_cast<vector<Point3D> *>(temp2);
+
+  double I = thiscomplex->CalculateIQ_2D_Error(*thisvec,qx,qy);
+
+  return Py_BuildValue("d",I);
+}
+
 //LORESModel method CalculateIQ(q) 
 char pypointsmodelpy_get_complex_i__name__[] = "get_complex_i";

realSpaceModeling/pointsmodelpy/pointsmodelpymodule/misc.h

@@ -182 +182 @@
 PyObject * pypointsmodelpy_get_complex_Iqxy(PyObject *, PyObject *);
 
+// ComplexModel method calculateIQ_2D_Error(pts,qx,qy)
+extern char pypointsmodelpy_get_complex_Iqxy_err__name__[];
+extern char pypointsmodelpy_get_complex_Iqxy_err__doc__[];
+extern "C"
+PyObject * pypointsmodelpy_get_complex_Iqxy_err(PyObject *, PyObject *);
+
 // ComplexModel method calculateIQ(iq)
 extern char pypointsmodelpy_get_complex_iq__name__[];