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

Timestamp:

Jan 5, 2012 12: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/corefourshell.cpp (modified) (1 diff)

sansmodels/src/c_models/corefourshell.cpp

@@ -21 +21 @@
 
 #include <math.h>
-#include "models.hh"
 #include "parameters.hh"
 #include <stdio.h>
 using namespace std;
+#include "corefourshell.h"
 
 extern "C" {
         #include "libSphere.h"
-        #include "corefourshell.h"
-}
+}
+
+typedef struct {
+  double scale;
+  double rad_core0;
+  double sld_core0;
+  double thick_shell1;
+  double sld_shell1;
+  double thick_shell2;
+  double sld_shell2;
+  double thick_shell3;
+  double sld_shell3;
+  double thick_shell4;
+  double sld_shell4;
+  double sld_solv;
+  double background;
+} CoreFourShellParameters;
 
 CoreFourShellModel :: CoreFourShellModel() {