Changeset eddff027 in sasview

Timestamp:

Aug 18, 2009 2:39:37 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:

7df26c3

Parents:

3c102d4

Message:

added coreshellellipsoidmodel

Files:

• sansmodels/src/sans/models/CoreShellEllipsoidModel.py (added)
• sansmodels/src/sans/models/c_extensions/spheroid.h (modified) (2 diffs)
• sansmodels/src/sans/models/c_models/CCoreShellEllipsoidModel.cpp (added)
• sansmodels/src/sans/models/c_models/c_models.cpp (modified) (2 diffs)
• sansmodels/src/sans/models/c_models/models.hh (modified) (2 diffs)
• sansmodels/src/sans/models/c_models/spheroid.cpp (modified) (3 diffs)
• sansview/perspectives/fitting/models.py (modified) (5 diffs)

sansmodels/src/sans/models/c_extensions/spheroid.h

@@ -2 +2 @@
 #define spheroid_h
 /** Structure definition for oblate parameters
- * [PYTHONCLASS] = CoreShellSpheroidModel
+ * [PYTHONCLASS] = CoreShellEllipsoidModel
  * [DISP_PARAMS] = equat_core, polar_core, equat_shell,polar_shell,axis_phi, axis_theta
    [DESCRIPTION] = <text>[SpheroidCoreShellModel] Calculates the form factor for an spheroid
@@ -21 +21 @@
                         Note:It is the users' responsibility to ensure
                         that shell radii are larger than core radii.
+                        oblate shell: equatorial radius > polar radius
+                        prolate shell: equatorial radius < polar radius
                         </text>
 

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

@@ -30 +30 @@
 void addCLamellarPSModel(PyObject *module);
 void addCLamellarPSHGModel(PyObject *module);
-void addCCoreShellSpheroidModel(PyObject *module);
+void addCCoreShellEllipsoidModel(PyObject *module);
 void addCOblateModel(PyObject *module);
 void addCProlateModel(PyObject *module);
@@ -226 +226 @@
         addCLamellarPSModel(m);
         addCLamellarPSHGModel(m);
-        addCCoreShellSpheroidModel(m);
+        addCCoreShellEllipsoidModel(m);
         addCOblateModel(m);
         addCProlateModel(m);

sansmodels/src/sans/models/c_models/models.hh

@@ -421 +421 @@
 };
 
-class CoreShellSpheroidModel{
+class CoreShellEllipsoidModel{
 public:
         // Model parameters
@@ -436 +436 @@
 
         // Constructor
-        CoreShellSpheroidModel();
+        CoreShellEllipsoidModel();
 
         // Operators to get I(Q)

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

@@ -32 +32 @@
 }
 
-CoreShellSpheroidModel :: CoreShellSpheroidModel() {
+CoreShellEllipsoidModel :: CoreShellEllipsoidModel() {
         scale      = Parameter(1.0);
         equat_core     = Parameter(200.0, true);
@@ -56 +56 @@
  * @return: function value
  */
-double CoreShellSpheroidModel :: operator()(double q) {
+double CoreShellEllipsoidModel :: operator()(double q) {
         double dp[8];
 
@@ -139 +139 @@
  * @return: function value
  */
-double CoreShellSpheroidModel :: evaluate_rphi(double q, double phi) {
+double CoreShellEllipsoidModel :: evaluate_rphi(double q, double phi) {
         return (*this).operator()(q);
 }
 
 
-double CoreShellSpheroidModel :: operator()(double qx, double qy) {
+double CoreShellEllipsoidModel :: operator()(double qx, double qy) {
         SpheroidParameters dp;
         // Fill parameter array

sansview/perspectives/fitting/models.py

@@ -119 +119 @@
         self.multiplication_factor.append(SphereModel)
         
+        from sans.models.CoreShellModel import CoreShellModel
+        self.shape_list.append(CoreShellModel)
+        
+        from sans.models.MultiShellModel import MultiShellModel
+        self.shape_list.append(MultiShellModel)
+        
+        from sans.models.VesicleModel import VesicleModel
+        self.shape_list.append(VesicleModel)
+        
+        from sans.models.BinaryHSModel import BinaryHSModel
+        self.shape_list.append(BinaryHSModel)
+        
         from sans.models.CylinderModel import CylinderModel
         self.shape_list.append(CylinderModel)
         self.multiplication_factor.append(CylinderModel)
         
+        from sans.models.CoreShellCylinderModel import CoreShellCylinderModel
+        self.shape_list.append(CoreShellCylinderModel)
+        
+        from sans.models.HollowCylinderModel import HollowCylinderModel
+        self.shape_list.append(HollowCylinderModel)
+              
+        from sans.models.FlexibleCylinderModel import FlexibleCylinderModel
+        self.shape_list.append(FlexibleCylinderModel)
+        
+        from sans.models.StackedDisksModel import StackedDisksModel
+        self.shape_list.append(StackedDisksModel)
+        
         from sans.models.ParallelepipedModel import ParallelepipedModel
         self.shape_list.append(ParallelepipedModel)
-        
-        from sans.models.CoreShellModel import CoreShellModel
-        self.shape_list.append(CoreShellModel)
-        
-        from sans.models.CoreShellCylinderModel import CoreShellCylinderModel
-        self.shape_list.append(CoreShellCylinderModel)
-        
-        from sans.models.MultiShellModel import MultiShellModel
-        self.shape_list.append(MultiShellModel)
-        
-        from sans.models.BinaryHSModel import BinaryHSModel
-        self.shape_list.append(BinaryHSModel)
-        
-        from sans.models.VesicleModel import VesicleModel
-        self.shape_list.append(VesicleModel)
-        
-        from sans.models.HollowCylinderModel import HollowCylinderModel
-        self.shape_list.append(HollowCylinderModel)
         
         from sans.models.EllipticalCylinderModel import EllipticalCylinderModel
@@ -150 +156 @@
         self.shape_list.append(EllipsoidModel)
         self.multiplication_factor.append(EllipsoidModel)
+      
+        from sans.models.CoreShellEllipsoidModel import CoreShellEllipsoidModel
+        self.shape_list.append(CoreShellEllipsoidModel)
          
         from sans.models.TriaxialEllipsoidModel import TriaxialEllipsoidModel
         self.shape_list.append(TriaxialEllipsoidModel)
-       
-        from sans.models.FlexibleCylinderModel import FlexibleCylinderModel
-        self.shape_list.append(FlexibleCylinderModel)
-        
-        from sans.models.StackedDisksModel import StackedDisksModel
-        self.shape_list.append(StackedDisksModel)
         
         from sans.models.LamellarModel import LamellarModel
@@ -172 +175 @@
         self.shape_list.append(LamellarPSHGModel)
       
-        from sans.models.OblateModel import OblateModel
-        self.shape_list.append(OblateModel)
-        
-        from sans.models.ProlateModel import ProlateModel
-        self.shape_list.append(ProlateModel)
-      
         ## Structure factor 
         from sans.models.SquareWellStructure import SquareWellStructure
@@ -207 +204 @@
         from sans.models.PorodModel import PorodModel
         self.shape_indep_list.append(PorodModel )
-        
-        from sans.models.LineModel import LineModel
-        self.shape_indep_list.append(LineModel)
         
         from sans.models.PeakGaussModel import PeakGaussModel
@@ -236 +230 @@
         from sans.models.TeubnerStreyModel import TeubnerStreyModel
         self.shape_indep_list.append(TeubnerStreyModel )
+        
+        from sans.models.LineModel import LineModel
+        self.shape_indep_list.append(LineModel)
     
         #Looking for plugins