Changes in sasmodels/conversion_table.py [bb584b3:d3e3f756] in sasmodels
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/conversion_table.py
rbb584b3 rd3e3f756 5 5 names for each parameter in sasmodels. This is used by :mod:`convert` to 6 6 determine the equivalent parameter set when comparing a sasmodels model to 7 the models defined in previous versions of SasView and sasmodels. This is now 8 versioned based on the version number of SasView. 9 10 When any sasmodels parameter or model name is changed, this must be modified to 11 account for that. 12 13 Usage: 14 <old_Sasview_version> : { 15 <new_model_name> : [ 16 <old_model_name> , 17 { 18 <new_param_name_1> : <old_param_name_1>, 19 ... 20 <new_param_name_n> : <old_param_name_n> 21 } 22 ] 23 } 24 25 Any future parameter and model name changes can and should be given in this 26 table for future compatibility. 7 the models defined in SasView 3.1. 27 8 """ 28 9 10 29 11 CONVERSION_TABLE = { 30 (4,0,1) : {},31 (4,0,0) : {},32 (3,1,2) : {33 12 "adsorbed_layer": [ 34 13 "Core2ndMomentModel", … … 232 211 ], 233 212 "correlation_length": [ 234 "CorrLength ",213 "CorrLengthModel", 235 214 { 236 215 "porod_scale": "scale_p", … … 239 218 "lorentz_exp": "exponent_l", 240 219 "cor_length": "length_l" 241 }, 242 "CorrLengthModel" 220 } 243 221 ], 244 222 "cylinder": [ … … 321 299 ], 322 300 "fractal_core_shell": [ 323 "FractalCoreShell ",301 "FractalCoreShellModel", 324 302 { 325 303 "sld_core": "core_sld", … … 331 309 "cor_length": "cor_length", 332 310 "volfraction": "volfraction", 333 }, 334 "FractalCoreShellModel" 311 } 335 312 ], 336 313 "fuzzy_sphere": [ … … 344 321 ], 345 322 "gauss_lorentz_gel": [ 346 "GaussLorentzGel ",323 "GaussLorentzGelModel", 347 324 { 348 325 "gauss_scale": "scale_g", … … 351 328 "background": "background", 352 329 "lorentz_scale": "scale_l" 353 }, 354 "GaussLorentzGelModel" 330 } 355 331 ], 356 332 "gaussian_peak": [ 357 "Peak GaussModel",333 "PeakGaussModel", 358 334 { 359 335 "peak_pos": "q0", 360 336 "sigma": "B", 361 }, 362 "PeakGaussModel", 337 } 363 338 ], 364 339 "gel_fit": [ … … 368 343 "lorentz_scale": "lScale", 369 344 "guinier_scale": "gScale", 370 "fractal_dim": " FractalExp",345 "fractal_dim": "scale", 371 346 "cor_length": "zeta", 372 347 } 373 348 ], 374 349 "guinier": [ 375 "Guinier ",350 "GuinierModel", 376 351 { 377 352 "rg": "rg" 378 }, 379 "GuinierModel", 353 } 380 354 ], 381 355 "guinier_porod": [ 382 "GuinierPorod ",356 "GuinierPorodModel", 383 357 { 384 358 "s": "dim", … … 387 361 "scale": "scale", 388 362 "background": "background" 389 }, 390 "GuinierPorodModel", 363 } 391 364 ], 392 365 "hardsphere": [ … … 481 454 "d_spacing": "spacing", 482 455 "Caille_parameter": "caille", 483 "Nlayers": " n_plates",456 "Nlayers": "N_plates", 484 457 } 485 458 ], … … 513 486 ], 514 487 "lorentz": [ 515 "Lorentz ",488 "LorentzModel", 516 489 { 517 490 "cor_length": "length" 518 }, 519 "LorentzModel", 491 } 520 492 ], 521 493 "mass_fractal": [ … … 538 510 ], 539 511 "mono_gauss_coil": [ 540 "Debye ",512 "DebyeModel", 541 513 { 542 514 "rg": "rg", 543 515 "i_zero": "scale", 544 516 "background": "background", 545 }, 546 "DebyeModel", 517 } 547 518 ], 548 519 "multilayer_vesicle": [ … … 551 522 "radius": "core_radius", 552 523 "sld_solvent": "core_sld", 553 "n_ pairs": "n_pairs",524 "n_shells": "n_pairs", 554 525 "thick_shell": "s_thickness", 555 526 "sld": "shell_sld", … … 593 564 ], 594 565 "peak_lorentz": [ 595 "Peak LorentzModel",566 "PeakLorentzModel", 596 567 { 597 568 "peak_pos": "q0", 598 569 "peak_hwhm": "B" 599 }, 600 "PeakLorentzModel", 570 } 601 571 ], 602 572 "pearl_necklace": [ … … 832 802 ], 833 803 "two_lorentzian": [ 834 "TwoLorentzian ",804 "TwoLorentzianModel", 835 805 { 836 806 "lorentz_scale_1": "scale_1", … … 841 811 "lorentz_length_1": "length_1", 842 812 "background": "background" 843 }, 844 "TwoLorentzianModel", 813 } 845 814 ], 846 815 "two_power_law": [ 847 "TwoPowerLaw ",816 "TwoPowerLawModel", 848 817 { 849 818 "coefficent_1": "coef_A", … … 852 821 "background": "background", 853 822 "crossover": "qc" 854 }, 855 "TwoPowerLawModel", 823 } 856 824 ], 857 825 "unified_power_Rg": [ 858 "UnifiedPowerRg",859 dict(((field_new+str(index), field_old+str(index))860 for field_new, field_old in [("rg", "Rg"),861 ("power", "power"),862 ("G", "G"),863 ("B", "B"),]864 for index in range(11)),865 **{866 "background": "background",867 "scale": "scale",868 }),869 826 "UnifiedPowerRgModel", 827 { 828 } 870 829 ], 871 830 "vesicle": [ … … 876 835 } 877 836 ] 878 }879 837 }
Note: See TracChangeset
for help on using the changeset viewer.