Changeset 2339249f in sasview

Timestamp:

Apr 15, 2010 3:58:14 PM (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:

13eb1c4

Parents:

247cb58

Message:

Found and fixed an error on normalizing by the volume

Location:

sansmodels/src/sans/models

Files:

• c_extensions/hollow_cylinder.c (modified) (1 diff)
• c_models/hollowcylinder.cpp (modified) (2 diffs)

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

@@ -96 +96 @@
         vol=acos(-1.0)*((pars->radius*pars->radius)-(pars->core_radius *pars->core_radius))
                         *(pars->length);
-        answer *= vol;
+        answer /= vol;
 
         //convert to [cm-1]

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

@@ -115 +115 @@
         if (vol != 0.0 && norm != 0.0) {
                 //Re-normalize by avg volume
-                sum = sum*(vol/norm);}
+                sum = sum/(vol/norm);}
 
         return sum/norm + background();
@@ -226 +226 @@
         if (vol != 0.0 && norm_vol != 0.0) {
                 //Re-normalize by avg volume
-                sum = sum*(vol/norm_vol);}
+                sum = sum/(vol/norm_vol);}
         return sum/norm + background();
 }