Changeset fa3f081 in sasview

Timestamp:

Jul 31, 2012 12:30:19 PM (12 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:

8037f4b

Parents:

69ebe91

Message:

better handling at singularities when background >0

File:

• sansmodels/src/c_models/masssurfacefractal.cpp (modified) (2 diffs)

sansmodels/src/c_models/masssurfacefractal.cpp

@@ -49 +49 @@
   // Not valid values => reject as 0.0
   if (mass_dim < 1e-16){
-          return 0.0;
+          return background;
   }
   if (mass_dim > 6.0){
-          return 0.0;
+          return background;
   }
   if (surface_dim < 1e-16){
-          return 0.0;
+          return background;
   }
   if (surface_dim > 6.0){
-          return 0.0;
+          return background;
   }
   tot_dim = 6.0 - surface_dim - mass_dim;
   //singulars
   if (tot_dim < 0.0){
-          return 0.0;
+          return background;
   }
 
@@ -82 +82 @@
 
   //another singular
-  if (inv_form == 0.0) return 0.0;
+  if (inv_form == 0.0) return background;
 
   form_factor = 1.0;