Changeset 737679d in sasmodels for sasmodels/models/triaxial_ellipsoid.py


Ignore:
Timestamp:
Apr 8, 2017 3:21:45 AM (7 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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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""" 
Note: See TracChangeset for help on using the changeset viewer.