Changeset 50a77df in sasview for run.py


Ignore:
Timestamp:
Mar 15, 2016 11:18:39 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:
f66d9d1
Parents:
02098e3 (diff), 0b63c6e (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

    rcd5e29b r50a77df  
    117117    # Compiled modules need to be pulled from the build directory. 
    118118    # Some packages are not where they are needed, so load them explicitly. 
    119     import sas.pr 
    120     sas.pr.core = import_package('sas.pr.core', 
    121                                   joinpath(build_path, 'sas', 'pr', 'core')) 
     119    import sas.sascalc.pr 
     120    sas.sascalc.pr.core = import_package('sas.sascalc.pr.core', 
     121                                  joinpath(build_path, 'sas', 'sascalc', 'pr', 'core')) 
    122122 
    123123 
Note: See TracChangeset for help on using the changeset viewer.