Changeset 2d6f1f1 in sasview

Timestamp:

Feb 29, 2012 4:01:39 PM (13 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:

4d0d5b1

Parents:

e08bd5b

Message:

hope it make better gui for vesicle

Location:

sansmodels

Files:

• include/vesicle.h (modified) (1 diff)
• src/c_models/vesicle.cpp (modified) (3 diffs)
• src/sans/models/MultiplicationModel.py (modified) (5 diffs)

sansmodels/include/vesicle.h

@@ -33 +33 @@
   Parameter thickness;
 
-  /// core scattering length density [1/A^(2)]
-  //  [DEFAULT]=core_sld= 6.36e-6 [1/A^(2)]
-  Parameter core_sld;
+  /// core_solv scattering length density [1/A^(2)]
+  //  [DEFAULT]=solv_sld= 6.36e-6 [1/A^(2)]
+  Parameter solv_sld;
 
   /// shell scattering length density [1/A^(2)]

sansmodels/src/c_models/vesicle.cpp

@@ -34 +34 @@
   double radius;
   double thickness;
-  double core_sld;
+  double solv_sld;
   double shell_sld;
   double background;
@@ -45 +45 @@
   thickness  = Parameter(30.0, true);
   thickness.set_min(0.0);
-  core_sld   = Parameter(6.36e-6);
+  solv_sld   = Parameter(6.36e-6);
   shell_sld   = Parameter(5.0e-7);
   background = Parameter(0.0);
@@ -64 +64 @@
   dp[1] = radius();
   dp[2] = thickness();
-  dp[3] = core_sld();
+  dp[3] = solv_sld();
   dp[4] = shell_sld();
   dp[5] = 0.0;

sansmodels/src/sans/models/MultiplicationModel.py

@@ -158 +158 @@
         if value != None: 
             factor = self.p_model.calculate_VR()
-            val = factor * value
-            self.p_model.setParam( 'scale', val)
-            
+            if factor == 0.0:
+                val= value
+            else:
+                val = value / factor
+            self.p_model.setParam( 'scale', value)
+            self.s_model.setParam( 'volfraction', val)
             
     def _set_effect_radius(self):
@@ -194 +197 @@
         self._set_effect_radius()
         if name in self.s_model.getParamList():
-            self.s_model.setParam( name, value)
+            if name != 'volfraction':
+                self.s_model.setParam( name, value)
             
 
@@ -240 +244 @@
         self._set_effect_radius()
         self._set_scale_factor()
+        print "scal=", self.p_model.params['scale']
+        print "volf=", self.s_model.params['volfraction']
         return self.params['scale_factor']*self.p_model.run(x)*self.s_model.run(x)
 
@@ -250 +256 @@
         self._set_effect_radius()
         self._set_scale_factor()
+        print "scal=", self.p_model.params['scale']
+        print "volf=", self.s_model.params['volfraction']
         return self.params['scale_factor']*self.p_model.runXY(x)* self.s_model.runXY(x)
     
@@ -262 +270 @@
         self._set_effect_radius()
         self._set_scale_factor()
+        print "scal=", self.p_model.params['scale']
+        print "volf=", self.s_model.params['volfraction']
         return self.params['scale_factor']*self.p_model.evalDistribution(x)* self.s_model.evalDistribution(x)