- Timestamp:
- Feb 13, 2015 1:53:03 AM (9 years ago)
- 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
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
run.py
r70a9d1c r3a39c2e 3 3 Run sasview in place. This allows sasview to use the python 4 4 files in the source tree without having to call setup.py install 5 first. A rebuild is still necessary when working on sa ns models5 first. A rebuild is still necessary when working on sas models 6 6 or c modules. 7 7 … … 105 105 addpath(joinpath(root, 'park-1.2.1')) 106 106 107 # Import the sa nsview package from root/sansview as sans.sansview. It would108 # be better to just store the package in src/sa ns/sansview.109 import sa ns110 sa ns.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')) 111 111 112 # The sa ns.models package Compiled Model files should be pulled in from the build directory even though113 # the source is stored in src/sa ns/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. 114 114 115 115 # Compiled modules need to be pulled from the build directory. 116 116 # Some packages are not where they are needed, so load them explicitly. 117 import sa ns.pr118 sa ns.pr.core = import_package('sans.pr.core',119 joinpath(build_path, 'sa ns', 'pr', 'core'))117 import sas.pr 118 sas.pr.core = import_package('sas.pr.core', 119 joinpath(build_path, 'sas', 'pr', 'core')) 120 120 #import_dll('park._modeling', build_path) 121 121 122 122 #park = import_package('park',os.path.join(build_path,'park')) 123 123 124 # Pull the entire sa ns.models package from the build directory since it contains124 # Pull the entire sas.models package from the build directory since it contains 125 125 # a mixture of autogenerated python and C. Any changes in models will require 126 126 # a rebuild with setup.py build 127 sa ns.models = import_package('sans.models', joinpath(build_path, 'sans', 'models'))127 sas.models = import_package('sas.models', joinpath(build_path, 'sas', 'models')) 128 128 129 129 sys.path.append(build_path) 130 130 131 131 #print "\n".join(sys.path) 132 #from sa ns.models import SphereModel132 #from sas.models import SphereModel 133 133 134 134 if __name__ == "__main__": 135 135 prepare() 136 from sa ns.sansview.sansview import run136 from sas.sasview.sasview import run 137 137 run()
Note: See TracChangeset
for help on using the changeset viewer.