Changeset cd5e29b in sasview for run.py


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

Legend:

Unmodified
Added
Removed
  • run.py

    r0e4e554 rcd5e29b  
    103103    # Put the source trees on the path 
    104104    addpath(joinpath(root, 'src')) 
    105     addpath(joinpath(root, 'park-1.2.1')) 
    106105 
    107106    # sasmodels on the path 
     
    121120    sas.pr.core = import_package('sas.pr.core', 
    122121                                  joinpath(build_path, 'sas', 'pr', 'core')) 
    123     #import_dll('park._modeling', build_path) 
    124122 
    125     #park = import_package('park',os.path.join(build_path,'park')) 
    126123 
    127124    # Pull the entire sas.models package from the build directory since it contains 
Note: See TracChangeset for help on using the changeset viewer.