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

Timestamp:

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

4785dec

Parents:

ec38f27

Message:

Corrections are made after multiplicationmodel unittest

File:

• sansmodels/src/sans/models/c_models/HayterMSA.cpp (modified) (2 diffs)

sansmodels/src/sans/models/c_models/HayterMSA.cpp

@@ -91 +91 @@
         HayterMSAParameters dp;
         // Fill parameter array
-        dp.effect_radius      = 2.0*effect_radius();
+        dp.effect_radius      = effect_radius();
         dp.charge      = charge();
         dp.volfraction = volfraction();
@@ -108 +108 @@
         // Loop over radius weight points
         for(int i=0; i<weights_rad.size(); i++) {
-                dp.effect_radius = 2.0*weights_rad[i].value;
+                dp.effect_radius = weights_rad[i].value;
 
-                                        double _ptvalue = weights_rad[i].weight
-                                                * HayterMSA_analytical_2DXY(&dp, qx, qy);
-                                        sum += _ptvalue;
+                double _ptvalue = weights_rad[i].weight
+                        * HayterMSA_analytical_2DXY(&dp, qx, qy);
+                sum += _ptvalue;
 
-                                        norm += weights_rad[i].weight;
+                norm += weights_rad[i].weight;
         }
         // Averaging in theta needs an extra normalization