Changeset ad79f49 in sasmodels for sasmodels/sasview_model.py
- Timestamp:
- Sep 12, 2017 11:29:02 AM (7 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:
- 946c8d27
- Parents:
- a57a902 (diff), b18e650 (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/sasview_model.py
r44ca3e1 rad79f49 120 120 else: 121 121 model_info = modelinfo.make_model_info(kernel_module) 122 model = _make_model_from_info(model_info)122 model = make_model_from_info(model_info) 123 123 model.timestamp = getmtime(path) 124 124 … … 142 142 143 143 144 def make_model_from_info(model_info): 145 # type: (ModelInfo) -> SasviewModelType 146 """ 147 Convert *model_info* into a SasView model wrapper. 148 """ 149 def __init__(self, multiplicity=None): 150 SasviewModel.__init__(self, multiplicity=multiplicity) 151 attrs = _generate_model_attributes(model_info) 152 attrs['__init__'] = __init__ 153 attrs['filename'] = model_info.filename 154 ConstructedModel = type(model_info.name, (SasviewModel,), attrs) # type: SasviewModelType 155 return ConstructedModel 156 157 144 158 def _make_standard_model(name): 145 159 # type: (str) -> SasviewModelType … … 153 167 kernel_module = generate.load_kernel_module(name) 154 168 model_info = modelinfo.make_model_info(kernel_module) 155 return _make_model_from_info(model_info)169 return make_model_from_info(model_info) 156 170 157 171 … … 187 201 model_info = product.make_product_info(form_factor._model_info, 188 202 structure_factor._model_info) 189 ConstructedModel = _make_model_from_info(model_info)203 ConstructedModel = make_model_from_info(model_info) 190 204 return ConstructedModel() 191 205 192 def _make_model_from_info(model_info):193 # type: (ModelInfo) -> SasviewModelType194 """195 Convert *model_info* into a SasView model wrapper.196 """197 def __init__(self, multiplicity=None):198 SasviewModel.__init__(self, multiplicity=multiplicity)199 attrs = _generate_model_attributes(model_info)200 attrs['__init__'] = __init__201 attrs['filename'] = model_info.filename202 ConstructedModel = type(model_info.name, (SasviewModel,), attrs) # type: SasviewModelType203 return ConstructedModel204 206 205 207 def _generate_model_attributes(model_info):
Note: See TracChangeset
for help on using the changeset viewer.