Changeset 737679d in sasmodels


Ignore:
Timestamp:
Apr 8, 2017 5:21:45 AM (8 years ago)
Author:
richardh
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
3a45c2c, 9b79f29
Parents:
1f65db5 (diff), 3fd0499 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

docs edits for bcc_ fc_ sc_paracrystal

Files:
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • .gitattributes

    r46056006 r41709dc  
    1 *.py text=auto eol=lf 
    2 *.c text=auto eol=lf 
    3 *.h text=auto eol=lf 
    4 *.cpp text=auto eol=lf 
    5 *.rst text=auto eol=lf 
     1*.py text eol=lf 
     2*.c text eol=lf 
     3*.h text eol=lf 
     4*.cpp text eol=lf 
     5*.rst text eol=lf 

  • .travis.yml

    r01e551a r24cd982  
    11language: python 
    2 python: 
    3 - '2.7' 
     2 
     3sudo:  false 
     4 
     5matrix: 
     6  include: 
     7    - os: linux 
     8      env: 
     9        - PY=2.7 
     10        - NUMPYSPEC=numpy 
     11    - os: linux 
     12      env: 
     13        - PY=3 
     14        - NUMPYSPEC=numpy 
     15    - os: osx 
     16      language: generic 
     17      env: 
     18        - PY=2.7 
     19        - NUMPYSPEC=numpy 
     20    - os: osx 
     21      language: generic 
     22      env: 
     23        - PY=3 
     24        - NUMPYSPEC=numpy 
     25 
     26# whitelist 
    427branches: 
    528  only: 
    6   - master 
    7 virtualenv: 
    8   system_site_packages: true 
     29    - master 
     30 
     31addons: 
     32  apt: 
     33    packages: 
     34      opencl-headers 
     35 
    936before_install: 
    10 - sudo apt-get update; 
    11 - sudo apt-get install python-numpy python-scipy 
     37  - echo $TRAVIS_OS_NAME 
     38 
     39  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
     40      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; 
     41    fi; 
     42  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
     43      wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh; 
     44    fi; 
     45 
     46  - bash miniconda.sh -b -p $HOME/miniconda 
     47  - export PATH="$HOME/miniconda/bin:$PATH" 
     48  - hash -r 
     49  - conda update --yes conda 
     50 
     51  # Useful for debugging any issues with conda 
     52  - conda info -a 
     53 
     54  - conda install --yes python=$PY $NUMPYSPEC scipy cython mako cffi 
     55 
     56  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
     57      pip install pyopencl; 
     58    fi; 
     59 
    1260install: 
    13 - pip install bumps 
    14 - pip install unittest-xml-reporting 
     61  - pip install bumps 
     62  - pip install unittest-xml-reporting 
     63 
    1564script: 
    1665- export WORKSPACE=/home/travis/build/SasView/sasmodels/ 
    1766- python -m sasmodels.model_test dll all 
     67 
    1868notifications: 
    1969  slack: 

  • sasmodels/models/cylinder.py

    r15a90c1 r3fd0499  
    3838 
    3939 
    40 Numerical integration is simplified by a change of variable to $u = cos(\alpha)$ with  
    41 $sin(\alpha)=\sqrt{1-u^2}$.  
     40Numerical integration is simplified by a change of variable to $u = cos(\alpha)$ with 
     41$sin(\alpha)=\sqrt{1-u^2}$. 
    4242 
    4343The output of the 1D scattering intensity function for randomly oriented 
    … …  
    156156tests = [[{}, 0.2, 0.042761386790780453], 
    157157        [{}, [0.2], [0.042761386790780453]], 
    158 #  new coords     
     158#  new coords 
    159159        [{'theta':80.1534480601659, 'phi':10.1510817110481}, (qx, qy), 0.03514647218513852], 
    160160        [{'theta':80.1534480601659, 'phi':10.1510817110481}, [(qx, qy)], [0.03514647218513852]], 

  • sasmodels/models/parallelepiped.py

    r1916c52 r3fd0499  
    2424   The edge of the solid used to have to satisfy the condition that $A < B < C$. 
    2525   After some improvements to the effective radius calculation, used with an S(Q), 
    26    it is beleived that this is no longer the case.  
     26   it is beleived that this is no longer the case. 
    2727 
    2828The 1D scattering intensity $I(q)$ is calculated as: 
    … …  
    189189            mu = q*B 
    190190        V: Volume of the rectangular parallelepiped 
    191         alpha: angle between the long axis of the  
     191        alpha: angle between the long axis of the 
    192192            parallelepiped and the q-vector for 1D 
    193193""" 
    … …  
    219219    Return effective radius (ER) for P(q)*S(q) 
    220220    """ 
    221     # now that axes can be in any size order, need to sort a,b,c where a~b and c is either much smaller  
     221    # now that axes can be in any size order, need to sort a,b,c where a~b and c is either much smaller 
    222222    # or much larger 
    223223    abc = np.vstack((length_a, length_b, length_c)) 

  • sasmodels/models/sc_paracrystal.py

    r1f65db5 r737679d  
    8383model computation. 
    8484 
     85<<<<<<< HEAD 
    8586.. figure:: img/parallelepiped_angle_definition.png 
    8687 
    8788    Orientation of the crystal with respect to the scattering plane, when  
    8889    $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis). 
     90======= 
     91.. figure:: img/sc_crystal_angle_definition.jpg 
     92>>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305 
    8993 
    9094Reference 

  • sasmodels/models/triaxial_ellipsoid.py

    r1f65db5 r737679d  
    113113* **Author:** NIST IGOR/DANSE **Date:** pre 2010 
    114114* **Last Modified by:** Paul Kienzle (improved calculation) **Date:** April 4, 2017 
     115<<<<<<< HEAD 
    115116* **Last Reviewed by:** Paul Kienzle &Richard Heenan **Date:**  April 4, 2017 
     117======= 
     118* **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:**  April 4, 2017 
     119>>>>>>> 3fd04991e2575b02401723d8534c376cd9b66305 
    116120 
    117121""" 

  • sasmodels/models/bcc_paracrystal.py

    re2d6e3b r1f65db5  
    7979be accurate. 
    8080 
    81 .. figure:: img/bcc_angle_definition.png 
     81.. figure:: img/parallelepiped_angle_definition.png 
    8282 
    83     Orientation of the crystal with respect to the scattering plane. 
     83    Orientation of the crystal with respect to the scattering plane, when  
     84    $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis). 
    8485 
    8586References 

  • sasmodels/models/core_shell_parallelepiped.py

    r1916c52 r1f65db5  
    66The thickness and the scattering length density of the shell or  
    77"rim" can be different on each (pair) of faces. However at this time 
    8 the model does **NOT** actually calculate a c face rim despite the presence of 
    9 the parameter. 
     8the 1D calculation does **NOT** actually calculate a c face rim despite the presence of 
     9the parameter. Some other aspects of the 1D calculation may be wrong. 
    1010 
    1111.. note:: 

  • sasmodels/models/fcc_paracrystal.py

    re2d6e3b r1f65db5  
    76762D model computation. 
    7777 
    78 .. figure:: img/bcc_angle_definition.png 
     78.. figure:: img/parallelepiped_angle_definition.png 
    7979 
    80     Orientation of the crystal with respect to the scattering plane. 
     80    Orientation of the crystal with respect to the scattering plane, when  
     81    $\theta = \phi = 0$ the $c$ axis is along the beam direction (the $z$ axis). 
    8182 
    8283References 
Note: See TracChangeset for help on using the changeset viewer.