Changeset eddff027 in sasview for sansmodels


Ignore:
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

Location:
sansmodels/src/sans/models
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

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

    r975ec8e reddff027  
    22#define spheroid_h 
    33/** Structure definition for oblate parameters 
    4  * [PYTHONCLASS] = CoreShellSpheroidModel 
     4 * [PYTHONCLASS] = CoreShellEllipsoidModel 
    55 * [DISP_PARAMS] = equat_core, polar_core, equat_shell,polar_shell,axis_phi, axis_theta 
    66   [DESCRIPTION] = <text>[SpheroidCoreShellModel] Calculates the form factor for an spheroid 
    … …  
    2121                        Note:It is the users' responsibility to ensure 
    2222                        that shell radii are larger than core radii. 
     23                        oblate shell: equatorial radius > polar radius 
     24                        prolate shell: equatorial radius < polar radius 
    2325                        </text> 
    2426 

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

    r975ec8e reddff027  
    3030void addCLamellarPSModel(PyObject *module); 
    3131void addCLamellarPSHGModel(PyObject *module); 
    32 void addCCoreShellSpheroidModel(PyObject *module); 
     32void addCCoreShellEllipsoidModel(PyObject *module); 
    3333void addCOblateModel(PyObject *module); 
    3434void addCProlateModel(PyObject *module); 
    … …  
    226226        addCLamellarPSModel(m); 
    227227        addCLamellarPSHGModel(m); 
    228         addCCoreShellSpheroidModel(m); 
     228        addCCoreShellEllipsoidModel(m); 
    229229        addCOblateModel(m); 
    230230        addCProlateModel(m); 

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

    r2cb89e7 reddff027  
    421421}; 
    422422 
    423 class CoreShellSpheroidModel{ 
     423class CoreShellEllipsoidModel{ 
    424424public: 
    425425        // Model parameters 
    … …  
    436436 
    437437        // Constructor 
    438         CoreShellSpheroidModel(); 
     438        CoreShellEllipsoidModel(); 
    439439 
    440440        // Operators to get I(Q) 

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

    r975ec8e reddff027  
    3232} 
    3333 
    34 CoreShellSpheroidModel :: CoreShellSpheroidModel() { 
     34CoreShellEllipsoidModel :: CoreShellEllipsoidModel() { 
    3535        scale      = Parameter(1.0); 
    3636        equat_core     = Parameter(200.0, true); 
    … …  
    5656 * @return: function value 
    5757 */ 
    58 double CoreShellSpheroidModel :: operator()(double q) { 
     58double CoreShellEllipsoidModel :: operator()(double q) { 
    5959        double dp[8]; 
    6060 
    … …  
    139139 * @return: function value 
    140140 */ 
    141 double CoreShellSpheroidModel :: evaluate_rphi(double q, double phi) { 
     141double CoreShellEllipsoidModel :: evaluate_rphi(double q, double phi) { 
    142142        return (*this).operator()(q); 
    143143} 
    144144 
    145145 
    146 double CoreShellSpheroidModel :: operator()(double qx, double qy) { 
     146double CoreShellEllipsoidModel :: operator()(double qx, double qy) { 
    147147        SpheroidParameters dp; 
    148148        // Fill parameter array 
Note: See TracChangeset for help on using the changeset viewer.