Changeset 256dfe1 in sasmodels for sasmodels/convert.json

Timestamp:

Jul 18, 2016 12:42:29 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

c5ac2b2

Parents:

46ed760

Message:

allow comparison of multiplicity models with sasview 3.x

File:

• sasmodels/convert.json (modified) (2 diffs)

sasmodels/convert.json

@@ -79 +79 @@
   ], 
   "core_multi_shell": [
-    "CoreMultiShellModel", 
-    {
-      "thick_shell": "thick_shell", 
-      "radius": "rad_core0", 
-      "sld": "sld_core0", 
-      "sld_shell": "sld_in_shell", 
-      "sld_solvent": "sld_solv", 
+    "CoreMultiShellModel",
+    {
+      "thickness": "thick_shell",
+      "sld": "sld_shell",
+      "radius": "rad_core0",
+      "sld_core": "sld_core0",
+      "sld_solvent": "sld_solv",
       "n": "n_shells"
     }
@@ -475 +475 @@
   ], 
   "onion": [
-    "OnionExpShellModel", 
+    "OnionModel",
     {
       "A": "A_shell", 
-      "core_sld": "sld_core0", 
+      "sld_core": "sld_core0",
       "core_radius": "rad_core0", 
-      "out_sld": "sld_out_shell", 
-      "n": "n_shells", 
-      "solvent_sld": "sld_solv", 
+      "n": "n_shells",
+      "sld_solvent": "sld_solv",
       "thickness": "thick_shell", 
-      "in_sld": "sld_in_shell"
+      "sld_in": "sld_in_shell",
+      "sld_out": "sld_out_shell"
     }
   ],