Changeset 72c969b in sasview for src/sans/models/c_extension/c_models/triaxialellipsoid.cpp

Timestamp:

Sep 8, 2014 5:57:17 AM (10 years ago)

Author:

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:

1792311

Parents:

a9807efa (diff), 5b1392f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

sync with trunk

File:

• src/sans/models/c_extension/c_models/triaxialellipsoid.cpp (modified) (1 diff)

src/sans/models/c_extension/c_models/triaxialellipsoid.cpp

@@ -342 +342 @@
               * weights_semi_axisA[i].value*weights_semi_axisB[j].value*weights_semi_axisC[k].value;
               if (weights_theta.size()>1) {
-                _ptvalue *= fabs(cos(weights_theta[k].value*pi/180.0));
+                _ptvalue *= fabs(cos(weights_theta[l].value*pi/180.0));
               }
               sum += _ptvalue;