Changeset 422e7e8 in sasview for src/sas/models/c_extension/c_models/pearlnecklace.cpp

Timestamp:

Jun 2, 2015 11:50:19 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

e1442d4

Parents:

ae047f2

Message:

allow non-integer values for number of pearls in model by rounding to the nearest integer in the computation.

File:

• src/sas/models/c_extension/c_models/pearlnecklace.cpp (modified) (1 diff)

src/sas/models/c_extension/c_models/pearlnecklace.cpp

@@ -16 +16 @@
   double edge_separation = dp[2];
   double thick_string = dp[3];
-  double num_pearls = dp[4];
+  double num_pearls = floor(dp[4]+0.5);  // Force integer number of pearls
   double sld_pearl = dp[5];
   double sld_string = dp[6];