Changeset c98c772 in sasmodels for sascomp

Timestamp:

May 20, 2016 6:23:46 PM (9 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:

7e16db7

Parents:

5efe850 (diff), a7a5ff3 (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 pull request #5 from bmaranville/master

import was causing problems… race condition?

File:

• sascomp (modified) (2 diffs)

sascomp

@@ -4 +4 @@
 import os
 import glob
+import logging
+logging.basicConfig(level=logging.INFO)
 
 def main():
@@ -11 +13 @@
     sys.path.insert(0, os.path.join(root, 'bumps'))
     sys.path.insert(0, os.path.join(root, 'periodictable'))
+    sys.path.insert(0, os.path.join(root, 'tinycc'))
     if sasview:  # glob returns a list
         sys.path.insert(0, sasview[0])