Changeset cd5e29b in sasview for run.py

Timestamp:

Sep 1, 2015 9:20:05 AM (9 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:

f0d720b

Parents:

40c5104 (diff), 600bea1 (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 branch 'master' into sasmodels-integration

File:

• run.py (modified) (2 diffs)

run.py

@@ -103 +103 @@
     # Put the source trees on the path
     addpath(joinpath(root, 'src'))
-    addpath(joinpath(root, 'park-1.2.1'))
 
     # sasmodels on the path
@@ -121 +120 @@
     sas.pr.core = import_package('sas.pr.core',
                                   joinpath(build_path, 'sas', 'pr', 'core'))
-    #import_dll('park._modeling', build_path)
 
-    #park = import_package('park',os.path.join(build_path,'park'))
 
     # Pull the entire sas.models package from the build directory since it contains