Changeset 1b49bf8 in sasmodels for sasmodels/conversion_table.py
- Timestamp:
- Oct 17, 2016 11:20:39 AM (8 years ago)
- Branches:
- master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- 8393c74
- Parents:
- 218cdbc
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/conversion_table.py
r68425bf r1b49bf8 143 143 } 144 144 ], 145 "core_shell_ellipsoid ": [145 "core_shell_ellipsoid(nonXT)": [ 146 146 "CoreShellEllipsoidModel", 147 147 { 148 "sld_core": "sld_core", 149 "sld_shell": "sld_shell", 150 "sld_solvent": "sld_solvent", 151 "equat_core": "equat_core", 152 "equat_shell": "equat_shell", 153 "polar_core": "polar_core", 154 "polar_shell": "polar_shell", 155 "theta": "axis_theta", 148 156 "phi": "axis_phi", 149 "sld_core": "sld_core",150 "polar_shell": "polar_shell",151 "sld_solvent": "sld_solvent",152 "equat_shell": "equat_shell",153 "equat_core": "equat_core",154 "theta": "axis_theta",155 "polar_core": "polar_core",156 "sld_shell": "sld_shell"157 157 } 158 158 ], … … 160 160 "CoreShellEllipsoidXTModel", 161 161 { 162 "phi": "axis_phi",163 162 "sld_core": "sld_core", 163 "sld_shell": "sld_shell", 164 "sld_solvent": "sld_solvent", 165 "radius_equat_core": "equat_core", 166 "thick_shell": "T_shell", 164 167 "x_core": "X_core", 165 "sld_solvent": "sld_solvent",166 "thick_shell": "T_shell",167 168 "x_polar_shell": "XpolarShell", 168 169 "theta": "axis_theta", 169 " sld_shell": "sld_shell"170 "phi": "axis_phi", 170 171 } 171 172 ], … … 240 241 "DABModel", 241 242 { 242 " length": "length"243 "cor_length": "length" 243 244 } 244 245 ], … … 300 301 "FractalCoreShellModel", 301 302 { 303 "sld_core": "core_sld", 302 304 "sld_shell": "shell_sld", 303 305 "sld_solvent": "solvent_sld", 304 "sld_core": "core_sld" 306 "radius": "radius", 307 "thickness": "thickness", 308 "fractal_dim": "frac_dim", 309 "cor_length": "cor_length", 310 "volfraction": "volfraction", 305 311 } 306 312 ], … … 327 333 "PeakGaussModel", 328 334 { 329 "sigma": "B" 335 "peak_pos": "q0", 336 "sigma": "B", 330 337 } 331 338 ], … … 335 342 "rg": "radius", 336 343 "lorentz_scale": "lScale", 337 "fractal_dim": "FractalExp", 344 "guinier_scale": "gScale", 345 "fractal_dim": "scale", 338 346 "cor_length": "zeta", 339 "guinier_scale": "gScale"340 347 } 341 348 ], … … 351 358 "s": "dim", 352 359 "rg": "rg", 353 " m": "m",360 "porod_exp": "m", 354 361 "scale": "scale", 355 362 "background": "background" … … 367 374 "HayterMSAStructure", 368 375 { 369 "salt_concentration": "saltconc",370 "radius_effective_pd": "effect_radius_pd",371 376 "radius_effective": "effect_radius", 372 "radius_effective_pd_n": "effect_radius_pd_n" 377 "volfraction": "volfraction", 378 "charge": "charge", 379 "temperature": "temperature", 380 "concentration_salt": "saltconc", 381 "dielectconst": "dielectconst", 382 #"radius_effective_pd_n": "effect_radius_pd_n", 383 #"radius_effective_pd": "effect_radius_pd", 373 384 } 374 385 ], … … 376 387 "HollowCylinderModel", 377 388 { 389 "sld": "sldCyl", 390 "sld_solvent": "sldSolv", 391 "radius": "core_radius", 392 "thickness": "radius", 393 "length": "length", 394 "theta": "axis_theta", 378 395 "phi": "axis_phi", 379 "scale": "scale",380 "radius_core": "core_radius",381 "sld_solvent": "sldSolv",382 "length": "length",383 "radius": "radius",384 "background": "background",385 "sld": "sldCyl",386 "theta": "axis_theta"387 396 } 388 397 ], … … 429 438 "LamellarPSHGModel", 430 439 { 440 "sld": "sld_tail", 441 "sld_head": "sld_head", 442 "sld_solvent": "sld_solvent", 443 "length_tail": "deltaT", 444 "length_head": "deltaH", 445 "d_spacing": "spacing", 431 446 "Caille_parameter": "caille", 432 447 "Nlayers": "n_plates", 433 "sld_head": "sld_head",434 "length_tail": "deltaT",435 "length_head": "deltaH",436 "sld": "sld_tail",437 "sld_solvent": "sld_solvent"438 448 } 439 449 ], … … 442 452 { 443 453 "sld": "sld_bi", 454 "sld_solvent": "sld_sol", 455 "thickness": "delta", 456 "d_spacing": "spacing", 444 457 "Caille_parameter": "caille", 445 458 "Nlayers": "N_plates", 446 "sld_solvent": "sld_sol",447 "thickness": "delta"448 459 } 449 460 ], … … 452 463 { 453 464 "sld": "sld_layer", 465 "sld_solvent": "sld_solvent", 466 "thickness": "thickness", 467 "d_spacing": "spacing", 454 468 "sigma_d": "pd_spacing", 455 " sld_solvent": "sld_solvent"469 "Nlayers": "Nlayers", 456 470 } 457 471 ], … … 562 576 { 563 577 "scale": "scale", 564 " thick_string": "thick_string",578 "string_thickness": "thick_string", 565 579 "sld_string": "sld_string", 566 580 "sld_solvent": "sld_solv", 567 581 "edge_sep": "edge_separation", 568 "num _pearls": "num_pearls",582 "number_of_pearls": "num_pearls", 569 583 "radius": "radius", 570 584 "background": "background", … … 595 609 "sld_corona": "rho_corona", 596 610 "sld_solvent": "rho_solv", 597 "sld_core": "rho_core" 611 "sld_core": "rho_core", 612 "ndensity": "ndensity", 613 "v_core": "v_core", 614 "v_corona": "v_corona", 615 "radius_core": "radius_core", 616 "rg": "radius_gyr", 617 "d_penetration": "d_penetration", 618 "n_aggreg": "n_aggreg", 598 619 } 599 620 ], … … 761 782 "TeubnerStreyModel", 762 783 { 763 "a2": "scale" 784 # Note: parameters are completely rewritten in convert.py 785 "volfraction_a": "volfraction_a", 786 "sld_a": "sld_a", 787 "sld_b": "sld_b", 788 "d": "d", 789 "xi": "xi", 764 790 } 765 791 ],
Note: See TracChangeset
for help on using the changeset viewer.