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

Timestamp:

Jun 26, 2009 5:49:03 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

27a0771

Parents:

f41b4c3

Message:

add 1d models

Location:

sansmodels/src/sans/models/c_extensions

Files:

• c_models.c (modified) (1 diff)
• flexible_cylinder.c (added)
• flexible_cylinder.h (added)
• parallelepiped.c (modified) (2 diffs)
• parallelepiped.h (modified) (1 diff)
• stacked_disks.c (added)
• stacked_disks.h (added)
• stakeddisks.c (added)
• triaxial_ellipsoid.c (added)
• triaxial_ellipsoid.h (added)

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

@@ -39 +39 @@
         addCDiamCylFunc(m);
         addCEllipticalCylinderModel(m);
+        addCTriaxialEllipsoidModel(m);
+        addCFlexibleCylinderModel(m);
+        addCStackedDisksModel(m);
         addDisperser(m);
         addCGaussian(m);

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

@@ -13 +13 @@
 /**
  * Function to evaluate 1D scattering function
- * @param pars: parameters of the cylinder
+ * @param pars: parameters of the parallelepiped
  * @param q: q-value
  * @return: function value
@@ -33 +33 @@
 /**
  * Function to evaluate 2D scattering function
- * @param pars: parameters of the cylinder
+ * @param pars: parameters of the parallelepiped
  * @param q: q-value
  * @return: function value

sansmodels/src/sans/models/c_extensions/parallelepiped.h

@@ -17 +17 @@
                 background:Incoherent Background [1/cm] 
                 </text>
-        [FIXED]= <text>short_edgeA.width; longer_edgeB.width; longuest_edgeC.width</text>
+        [FIXED]= <text>short_edgeA.width; longer_edgeB.width; longuest_edgeC.width;parallel_phi.width; parallel_theta.width</text>
         [ORIENTATION_PARAMS]= <text>parallel_phi; parallel_theta; parallel_phi.width; parallel_theta.width</text>