Changeset 5eb9154 in sasview for sansmodels/src/sans/models/HardsphereStructure.py

Timestamp:

Aug 31, 2009 3:25:44 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:

5be36bb

Parents:

572beba

Message:

calculation of the effective radius are added

File:

• sansmodels/src/sans/models/HardsphereStructure.py (modified) (5 diffs)

sansmodels/src/sans/models/HardsphereStructure.py

@@ -17 +17 @@
 
         WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
-                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\Hardsphere.h
+                 DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\hardsphere.h
                  AND RE-RUN THE GENERATOR SCRIPT
 
@@ -28 +28 @@
 class HardsphereStructure(CHardsphereStructure, BaseComponent):
     """ Class that evaluates a HardsphereStructure model. 
-        This file was auto-generated from ..\c_extensions\Hardsphere.h.
+        This file was auto-generated from ..\c_extensions\hardsphere.h.
         Refer to that file and the structure it contains
         for details of the model.
         List of default parameters:
-         radius          = 50.0 [A]
+         effect_radius   = 50.0 [A]
          volfraction     = 0.2 
 
@@ -54 +54 @@
                 = 0     , r >= 2R
                 
-                R: radius of the Hardsphere particle
+                R: effective radius of the Hardsphere particle
                 V:The volume fraction
                 
@@ -62 +62 @@
                 ## Parameter details [units, min, max]
         self.details = {}
-        self.details['radius'] = ['[A]', None, None]
+        self.details['effect_radius'] = ['[A]', None, None]
         self.details['volfraction'] = ['', None, None]
 
                 ## fittable parameters
-        self.fixed=['radius.width']
+        self.fixed=['effect_radius.width']
         
         ## parameters with orientation
@@ -98 +98 @@
         return CHardsphereStructure.evalDistribition(self, x)
         
+    def calculate_ER(self):
+        """ Calculate the effective radius for P(q)*S(q)
+            @param x: input q, or [q,phi]
+            @return: the value of the effective radius
+        """       
+        return CHardsphereStructure.calculate_ER(self)
+        
     def set_dispersion(self, parameter, dispersion):
         """