Changeset 1e2a1ba in sasmodels for sasmodels/kerneldll.py

Timestamp:

Apr 5, 2016 12:06:36 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

d2bb604

Parents:

ea05c87 (diff), 4d76711 (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.

Message:

Merge remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/core.py
sasmodels/custom/init.py
sasmodels/direct_model.py
sasmodels/generate.py
sasmodels/kernelpy.py
sasmodels/sasview_model.py

File:

• sasmodels/kerneldll.py (modified) (2 diffs)

sasmodels/kerneldll.py

@@ -187 +187 @@
         try:
             self.dll = ct.CDLL(self.dllpath)
-        except Exception as exc:
-            annotate_exception(exc, "while loading "+self.dllpath)
+        except:
+            annotate_exception("while loading "+self.dllpath)
             raise
 
@@ -214 +214 @@
         kernel = self.Iqxy if q_input.is_2d else self.Iq
         return DllKernel(kernel, self.info, q_input)
-    
+
     def release(self):
         """