Changeset c724ccd in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

Apr 12, 2010 12:31:10 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

ec658c85

Parents:

e2289b4

Message:

More models added and correction of Wrappergenerator on model parameter value precision

Location:

sansmodels/src/sans/models/c_extensions

Files:

• HayterMSA.c (modified) (1 diff)
• c_models.c (modified) (4 diffs)
• corefourshell.c (added)
• corefourshell.h (added)
• flexcyl_ellipX.c (added)
• flexcyl_ellipX.h (added)
• fractal.c (added)
• fractal.h (added)
• fuzzysphere.c (added)
• fuzzysphere.h (added)
• polygausscoil.c (added)
• polygausscoil.h (added)

sansmodels/src/sans/models/c_extensions/HayterMSA.c

@@ -20 +20 @@
         //Hayer takes diameter.
         dp[0] = 2.0 * pars->effect_radius;
-        dp[1] = pars->charge;
+        dp[1] = fabs(pars->charge);
         dp[2] = pars->volfraction;
         dp[3] = pars->temperature;

sansmodels/src/sans/models/c_extensions/c_models.c

@@ -26 +26 @@
     m = Py_InitModule3("c_models", module_methods,
                        "C extension module for SANS scattering models.");
-        
+
         import_array();
         addCCylinderModel(m);
@@ -32 +32 @@
         addCCoreShellCylinderModel(m);
         addCCoreShellModel(m);
+        addCCoreFourShellModel(m);
         addCEllipsoidModel(m);
         addCSphereModel(m);
+        addCFuzzySphereModel(m);
         addCHardsphereStructure(m);
         addCStickyHSStructure(m);
@@ -43 +45 @@
         addCTriaxialEllipsoidModel(m);
         addCFlexibleCylinderModel(m);
+        addCFlexCylEllipXModel(m);
         addCStackedDisksModel(m);
         addCLamellarPSModel(m);
@@ -60 +63 @@
         addCBinaryHSModel(m);
         addCBinaryHSPSF11Model(m);
+        addCPoly_GaussCoil(m);
+        addCFractalModel(m);
 
 }