Changes in sasmodels/sasview_model.py [a38b065:64614ad] in sasmodels
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/sasview_model.py
ra38b065 r64614ad 16 16 import logging 17 17 from os.path import basename, splitext 18 import thread19 18 20 19 import numpy as np # type: ignore … … 40 39 pass 41 40 42 calculation_lock = thread.allocate_lock()43 44 41 SUPPORT_OLD_STYLE_PLUGINS = True 45 42 … … 60 57 import sas.models 61 58 from sasmodels.conversion_table import CONVERSION_TABLE 62 for new_name, conversion in CONVERSION_TABLE. get((3,1,2), {}).items():59 for new_name, conversion in CONVERSION_TABLE.items(): 63 60 # CoreShellEllipsoidModel => core_shell_ellipsoid:1 64 61 new_name = new_name.split(':')[0] 65 old_name = conversion[0] if len(conversion) < 3 else conversion[2]62 old_name = conversion[0] 66 63 module_attrs = {old_name: find_model(new_name)} 67 64 ConstructedModule = type(old_name, (), module_attrs) … … 608 605 to the card for each evaluation. 609 606 """ 610 ## uncomment the following when trying to debug the uncoordinated calls611 ## to calculate_Iq612 #if calculation_lock.locked():613 # logging.info("calculation waiting for another thread to complete")614 # logging.info("\n".join(traceback.format_stack()))615 616 with calculation_lock:617 return self._calculate_Iq(qx, qy)618 619 def _calculate_Iq(self, qx, qy=None):620 607 #core.HAVE_OPENCL = False 621 608 if self._model is None:
Note: See TracChangeset
for help on using the changeset viewer.