Changeset bd91e8f in sasmodels for sasmodels/convert.py
- Timestamp:
- Mar 30, 2019 2:59:53 PM (5 years ago)
- Branches:
- ticket_1156
- Children:
- 345cc8f
- Parents:
- a3412a6 (diff), e15a822 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/convert.py
rb3f4831 rbd91e8f 105 105 translation[newid+str(k)] = oldid+str(k) 106 106 # Remove control parameter from the result 107 if model_info.control: 108 translation[model_info.control] = "CONTROL" 107 control_pars = [p.id for p in model_info.parameters.kernel_parameters 108 if p.is_control] 109 if control_pars: 110 control_id = control_pars[0] 111 translation[control_id] = "CONTROL" 109 112 return translation 110 113 … … 388 391 389 392 def revert_name(model_info): 393 """Translate model name back to the name used in SasView 3.x""" 390 394 oldname, _ = CONVERSION_TABLE.get(model_info.id, [None, {}]) 391 395 return oldname … … 657 661 658 662 def test_backward_forward(): 663 """ 664 Test conversion of model parameters from 4.x to 3.x and back. 665 """ 659 666 from .core import list_models 660 667 L = lambda name: _check_one(name, seed=1)
Note: See TracChangeset
for help on using the changeset viewer.