Changeset 3a39c2e in sasview for run.py


Ignore:
Timestamp:
Feb 13, 2015 3:53:03 AM (5 years ago)
Author:
krzywon
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:
8c9ffde
Parents:
79492222
Message:

Next iteration of the SANS→SAS is complete.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • run.py

    r70a9d1c r3a39c2e  
    33Run sasview in place.  This allows sasview to use the python 
    44files in the source tree without having to call setup.py install 
    5 first.  A rebuild is still necessary when working on sans models 
     5first.  A rebuild is still necessary when working on sas models 
    66or c modules. 
    77 
     
    105105    addpath(joinpath(root, 'park-1.2.1')) 
    106106 
    107     # Import the sansview package from root/sansview as sans.sansview.  It would 
    108     # be better to just store the package in src/sans/sansview. 
    109     import sans 
    110     sans.sansview = import_package('sans.sansview', joinpath(root,'sansview')) 
     107    # Import the sasview package from root/sasview as sas.sasview.  It would 
     108    # be better to just store the package in src/sas/sasview. 
     109    import sas 
     110    sas.sasview = import_package('sas.sasview', joinpath(root,'sasview')) 
    111111 
    112     # The sans.models package Compiled Model files should be pulled in from the build directory even though 
    113     # the source is stored in src/sans/models. 
     112    # The sas.models package Compiled Model files should be pulled in from the build directory even though 
     113    # the source is stored in src/sas/models. 
    114114 
    115115    # Compiled modules need to be pulled from the build directory. 
    116116    # Some packages are not where they are needed, so load them explicitly. 
    117     import sans.pr 
    118     sans.pr.core = import_package('sans.pr.core', 
    119                                   joinpath(build_path, 'sans', 'pr', 'core')) 
     117    import sas.pr 
     118    sas.pr.core = import_package('sas.pr.core', 
     119                                  joinpath(build_path, 'sas', 'pr', 'core')) 
    120120    #import_dll('park._modeling', build_path) 
    121121 
    122122    #park = import_package('park',os.path.join(build_path,'park')) 
    123123 
    124     # Pull the entire sans.models package from the build directory since it contains 
     124    # Pull the entire sas.models package from the build directory since it contains 
    125125    # a mixture of autogenerated python and C.  Any changes in models will require 
    126126    # a rebuild with setup.py build 
    127     sans.models = import_package('sans.models', joinpath(build_path, 'sans', 'models')) 
     127    sas.models = import_package('sas.models', joinpath(build_path, 'sas', 'models')) 
    128128 
    129129    sys.path.append(build_path) 
    130130 
    131131    #print "\n".join(sys.path) 
    132     #from sans.models import SphereModel 
     132    #from sas.models import SphereModel 
    133133 
    134134if __name__ == "__main__": 
    135135    prepare() 
    136     from sans.sansview.sansview import run 
     136    from sas.sasview.sasview import run 
    137137    run() 
Note: See TracChangeset for help on using the changeset viewer.