Changeset a0782f1 in sasview for sansmodels/src/sans/models

Timestamp:

Mar 31, 2009 5:54:58 PM (16 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:

40945a3

Parents:

6b38781

Message:

Added 2nd virial coeff. functions

File:

• sansmodels/src/sans/models/c_models/models.hh (modified) (1 diff)

sansmodels/src/sans/models/c_models/models.hh

@@ -118 +118 @@
         Parameter saltconc;
         Parameter dielectconst;
-        
+
         // Constructor
         HayterMSAStructure();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class DiamEllipFunc{
+public:
+        // Model parameters
+        Parameter radius_a;
+        Parameter radius_b;
+
+        // Constructor
+        DiamEllipFunc();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class DiamCylFunc{
+public:
+        // Model parameters
+        Parameter radius;
+        Parameter length;
+
+        // Constructor
+        DiamCylFunc();
 
         // Operators to get I(Q)