Changeset 5bc6d21 in sasmodels


Ignore:
Timestamp:
Mar 18, 2018 3:30:41 PM (7 years ago)
Author:
butler
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
17a8c94
Parents:
331870d
Message:

more standardization of text

moved validation to its own section (is that the standard?) and moved
parallelipiped frong stuff around so start with Definition as per
standard.

Location:
sasmodels/models
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/core_shell_parallelepiped.py

    r331870d r5bc6d21  
    143143    detector plane. 
    144144 
     145 
     146Validation 
     147---------- 
     148 
     149Cross-checked against hollow rectangular prism and rectangular prism for equal 
     150thickness overlapping sides, and by Monte Carlo sampling of points within the 
     151shape for non-uniform, non-overlapping sides. 
     152 
     153 
    145154References 
    146155---------- 
    … …  
    159168* **Converted to sasmodels by:** Miguel Gonzalez **Date:** February 26, 2016 
    160169* **Last Modified by:** Paul Kienzle **Date:** October 17, 2017 
    161 * Cross-checked against hollow rectangular prism and rectangular prism for 
    162   equal thickness overlapping sides, and by Monte Carlo sampling of points 
    163   within the shape for non-uniform, non-overlapping sides. 
    164170""" 
    165171 

  • sasmodels/models/parallelepiped.py

    rdbf1a60 r5bc6d21  
    22# Note: model title and parameter table are inserted automatically 
    33r""" 
    4 The form factor is normalized by the particle volume. 
    5 For information about polarised and magnetic scattering, see 
    6 the :ref:`magnetism` documentation. 
    7  
    84Definition 
    95---------- 
    … …  
    117 This model calculates the scattering from a rectangular parallelepiped 
    128 (:numref:`parallelepiped-image`). 
    13  If you need to apply polydispersity, see also :ref:`rectangular-prism`. 
     9 If you need to apply polydispersity, see also :ref:`rectangular-prism`. For 
     10 information about polarised and magnetic scattering, see 
     11the :ref:`magnetism` documentation. 
    1412 
    1513.. _parallelepiped-image: 
    … …  
    2624error, or fixing of some dimensions at expected values, may help. 
    2725 
    28 The 1D scattering intensity $I(q)$ is calculated as: 
     26The form factor is normalized by the particle volume and the 1D scattering 
     27intensity $I(q)$ is then calculated as: 
    2928 
    3029.. Comment by Miguel Gonzalez: 
Note: See TracChangeset for help on using the changeset viewer.