Changeset 060413c in sasview for src/sas/qtgui/Perspectives


Ignore:
Timestamp:
Aug 6, 2018 9:48:06 AM (6 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
03e04a4
Parents:
3d18691
Message:

More CR and merge fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r3d18691 r060413c  
    19351935            # custom kernel load requires full path 
    19361936            name = os.path.join(ModelUtilities.find_plugins_dir(), model_name+".py") 
    1937         kernel_module = generate.load_kernel_module(name) 
     1937        try: 
     1938            kernel_module = generate.load_kernel_module(name) 
     1939        except ModuleNotFoundError: 
     1940            # maybe it's a recategorised custom model? 
     1941            name = os.path.join(ModelUtilities.find_plugins_dir(), model_name+".py") 
     1942            # If this rises, it's a valid problem. 
     1943            kernel_module = generate.load_kernel_module(name) 
    19381944 
    19391945        if hasattr(kernel_module, 'parameters'): 
Note: See TracChangeset for help on using the changeset viewer.