Changeset 011e0e4 in sasview for sansmodels/src/c_models/coreshellcylinder.cpp

Timestamp:

Jan 5, 2012 2:23:15 PM (13 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:

98fdccd

Parents:

0ba3b08

Message:

core-shell + ellipsoid refactor

File:

• sansmodels/src/c_models/coreshellcylinder.cpp (modified) (1 diff)

sansmodels/src/c_models/coreshellcylinder.cpp

@@ -18 +18 @@
  *   sansmodels/src/libigor
  *
- *      TODO: refactor so that we pull in the old sansmodels.c_extensions
  */
 
 #include <math.h>
-#include "models.hh"
 #include "parameters.hh"
 #include <stdio.h>
 using namespace std;
+#include "core_shell_cylinder.h"
 
 extern "C" {
         #include "libCylinder.h"
         #include "libStructureFactor.h"
-        #include "core_shell_cylinder.h"
-}
+}
+
+typedef struct {
+  double scale;
+  double radius;
+  double thickness;
+  double length;
+  double core_sld;
+  double shell_sld;
+  double solvent_sld;
+  double background;
+  double axis_theta;
+  double axis_phi;
+} CoreShellCylinderParameters;
+
+
+/**
+ * Function to evaluate 2D scattering function
+ * @param pars: parameters of the core-shell cylinder
+ * @param q: q-value
+ * @param q_x: q_x / q
+ * @param q_y: q_y / q
+ * @return: function value
+ */
+static double core_shell_cylinder_analytical_2D_scaled(CoreShellCylinderParameters *pars, double q, double q_x, double q_y) {
+  double cyl_x, cyl_y, cyl_z;
+  double q_z;
+  double alpha, vol, cos_val;
+  double answer;
+  //convert angle degree to radian
+  double pi = 4.0*atan(1.0);
+  double theta = pars->axis_theta * pi/180.0;
+  double phi = pars->axis_phi * pi/180.0;
+
+    // Cylinder orientation
+    cyl_x = sin(theta) * cos(phi);
+    cyl_y = sin(theta) * sin(phi);
+    cyl_z = cos(theta);
+
+    // q vector
+    q_z = 0;
+
+    // Compute the angle btw vector q and the
+    // axis of the cylinder
+    cos_val = cyl_x*q_x + cyl_y*q_y + cyl_z*q_z;
+
+    // The following test should always pass
+    if (fabs(cos_val)>1.0) {
+      printf("core_shell_cylinder_analytical_2D: Unexpected error: cos(alpha)=%g\n", cos_val);
+      return 0;
+    }
+
+  alpha = acos( cos_val );
+
+  // Call the IGOR library function to get the kernel
+  answer = CoreShellCylKernel(q, pars->radius, pars->thickness,
+                pars->core_sld,pars->shell_sld,
+                pars->solvent_sld, pars->length/2.0, alpha) / fabs(sin(alpha));
+
+  //normalize by cylinder volume
+  vol=pi*(pars->radius+pars->thickness)
+      *(pars->radius+pars->thickness)
+      *(pars->length+2.0*pars->thickness);
+  answer /= vol;
+
+  //convert to [cm-1]
+  answer *= 1.0e8;
+
+  //Scale
+  answer *= pars->scale;
+
+  // add in the background
+  answer += pars->background;
+
+  return answer;
+}
+
+/**
+ * Function to evaluate 2D scattering function
+ * @param pars: parameters of the core-shell cylinder
+ * @param q: q-value
+ * @return: function value
+ */
+static double core_shell_cylinder_analytical_2DXY(CoreShellCylinderParameters *pars, double qx, double qy) {
+  double q;
+  q = sqrt(qx*qx+qy*qy);
+    return core_shell_cylinder_analytical_2D_scaled(pars, q, qx/q, qy/q);
+}
+
 
 CoreShellCylinderModel :: CoreShellCylinderModel() {