Changeset cde9d7d in sasview for src/sas

Timestamp:

Mar 18, 2016 6:45:19 AM (8 years ago)

Author:

ajj

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b609c34

Parents:

bd971ec

Message:

Deal with dodgy models

File:

• src/sas/sasgui/perspectives/fitting/models.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/models.py

@@ -302 +302 @@
         #Build list automagically from sasmodels package
         for mod_name in sasmodels.core.list_models():
-            mod_def = sasmodels.core.load_model_info(mod_name)
-            self.model_dictionary[mod_def['name']] = make_class(mod_def,dtype=None,namestyle='name')
-            if mod_def['structure_factor'] == True:
-                self.struct_list.append(self.model_dictionary[mod_def['name']])
-            if mod_def['variant_info'] is not None:
-                self.multi_func_list.append(self.model_dictionary[mod_def['name']])
-            else:
-                self.model_name_list.append(mod_def['name'])
-            if mod_def['ER'] is not None:
-                self.multiplication_factor.append(self.model_dictionary[mod_def['name']])
+            try:
+                mod_def = sasmodels.core.load_model_info(mod_name)
+                self.model_dictionary[mod_def['name']] = make_class(mod_def,dtype=None,namestyle='name')
+                if mod_def['structure_factor'] == True:
+                    self.struct_list.append(self.model_dictionary[mod_def['name']])
+                if mod_def['variant_info'] is not None:
+                    self.multi_func_list.append(self.model_dictionary[mod_def['name']])
+                else:
+                    self.model_name_list.append(mod_def['name'])
+                if mod_def['ER'] is not None:
+                    self.multiplication_factor.append(self.model_dictionary[mod_def['name']])
+            except:
+                logging.info("Problem loading %s model" % mod_name)
 
         #Looking for plugins