Changeset 8b677ec in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

Sep 8, 2009 9:02:19 AM (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:

4785dec

Parents:

ec38f27

Message:

Corrections are made after multiplicationmodel unittest

Location:

sansmodels/src/sans/models/c_extensions

Files:

• HayterMSA.c (modified) (1 diff)
• HayterMSA.h (modified) (1 diff)

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

@@ -15 +15 @@
  * @return: function value
  */
+
 double HayterMSA_analytical_1D(HayterMSAParameters *pars, double q) {
         double dp[6];
         //Hayer takes diameter.
-        dp[0] = 2.0*pars->effect_radius;
+        dp[0] = 2.0 * pars->effect_radius;
         dp[1] = pars->charge;
-        dp[1] = pars->volfraction;
+        dp[2] = pars->volfraction;
         dp[3] = pars->temperature;
         dp[4] = pars->saltconc;

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

@@ -50 +50 @@
 } HayterMSAParameters;
 
-
-
 /// 1D scattering function
 double HayterMSA_analytical_1D(HayterMSAParameters *pars, double q);