Changeset 1d115ef in sasview

Timestamp:

Jul 26, 2015 11:41:57 AM (9 years ago)

Author:

butler

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:

44d20af

Parents:

f008ee2

Message:

fix parameter name - was scale now is FractalExp? as it should be. This
model has two scale parameters: one for the Guinier term and one for the
Lorentz term. The fractal exponent D (used in the Lorentz term) was
cofusingly labeled scale in the gui.

Location:

src/sas/models

Files:

• c_extension/c_models/GelFit.cpp (modified) (2 diffs)
• include/GelFit.h (modified) (1 diff)

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

@@ -34 +34 @@
     radius = Parameter(104.0,true);
     radius.set_min(2.0);
-    scale = Parameter(2.0,true);
+    FractalExp = Parameter(2.0,true);
     background = Parameter(0.01);
 }
@@ -43 +43 @@
     dp[0] = zeta();
     dp[1] = radius();
-    dp[2] = scale();
+    dp[2] = FractalExp();
     
     if (dp[2] <= 0)

src/sas/models/include/GelFit.h

@@ -33 +33 @@
   Parameter radius;
 
-  //  [DEFAULT]=scale= 2
-  Parameter scale;
+  //  [DEFAULT]=FractalExp= 2
+  Parameter FractalExp;
 
   //  [DEFAULT]=background= 0.01