Changeset 037aa3d in sasmodels

Timestamp:

Nov 2, 2016 1:33:30 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

fa6d6fc

Parents:

e85aa2e

Message:

implement forward conversion for core-shell ellipsoid, non XT model

File:

• sasmodels/convert.py (modified) (1 diff)

sasmodels/convert.py

@@ -162 +162 @@
         oldpars['rimC.width'] = 0.0
     elif name == 'core_shell_ellipsoid:1':
+        # Reverse translation (from new to old), from core_shell_ellipsoid.c
+        #    equat_shell = equat_core + thick_shell
+        #    polar_core = equat_core * x_core
+        #    polar_shell = equat_core * x_core + thick_shell*x_polar_shell
+        # Forward translation (from old to new), inverting reverse translation:
+        #    thick_shell = equat_shell - equat_core
+        #    x_core = polar_core / equat_core
+        #    x_polar_shell = (polar_shell - polar_core)/(equat_shell - equat_core)
+        # Auto translation (old <=> new) happens after hand_convert
+        #    equat_shell <=> thick_shell
+        #    polar_core <=> x_core
+        #    polar_shell <=> x_polar_shell
+        # So...
+        equat_core, equat_shell = oldpars['equat_core'], oldpars['equat_shell']
+        polar_core, polar_shell = oldpars['polar_core'], oldpars['polar_shell']
+        oldpars['equat_shell'] = equat_shell - equat_core
+        oldpars['polar_core'] = polar_core / equat_core
+        oldpars['polar_shell'] = (polar_shell-polar_core)/(equat_shell-equat_core)
     elif name == 'hollow_cylinder':
         # now uses radius and thickness