Changeset 73f9a68 in sasview for sansmodels
- Timestamp:
- Aug 10, 2011 2:27:51 PM (13 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:
- a60b8b6
- Parents:
- 299dc45
- File:
-
- 1 edited
-
sansmodels/setup.py (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/setup.py
r3e7d161 r73f9a68 49 49 class_list = ModelFactory().getAllModels() 50 50 for name in class_list: 51 odb = open("s ans/models/pyre/%s.odb" % name, 'w')51 odb = open("src/sans/models/pyre/%s.odb" % name, 'w') 52 52 odb.write(createODBcontent(name)) 53 53 odb.close() 54 print "s ans/models/pyre/%s.odb created" % name54 print "src/sans/models/pyre/%s.odb created" % name 55 55 56 56 # … … 73 73 74 74 # Build the module name 75 srcdir = "s ans/models/c_extensions"76 igordir = "s ans/models/libigor"75 srcdir = "src/sans/models/c_extensions" 76 igordir = "src/sans/models/libigor" 77 77 78 78 print "Installing SANS models" … … 91 91 92 92 # Use the pure python modules 93 package_dir = {"sans.models.sans_extension":"sans/models/c_extensions", 93 package_dir = {"sans":"src/sans", 94 "sans.models.sans_extension":"src/sans/models/c_extensions", 94 95 }, 95 96 package_data={'sans.models': [os.path.join('media', "*")]}, … … 99 100 ext_modules = [ Extension("sans.models.sans_extension.c_models", 100 101 sources = [ 101 "s ans/models/c_models/c_models.cpp",102 "src/sans/models/c_models/c_models.cpp", 102 103 #srcdir+"/CSphereModel.c", 103 104 #srcdir+"/sphere.c", 104 "s ans/models/c_models/CSphereModel.cpp",105 "s ans/models/c_models/CPearlNecklaceModel.cpp",106 "s ans/models/c_models/pearlnecklace.cpp",105 "src/sans/models/c_models/CSphereModel.cpp", 106 "src/sans/models/c_models/CPearlNecklaceModel.cpp", 107 "src/sans/models/c_models/pearlnecklace.cpp", 107 108 srcdir+"/pearlnecklace.c", 108 "s ans/models/c_models/COnionModel.cpp",109 "s ans/models/c_models/onion.cpp",109 "src/sans/models/c_models/COnionModel.cpp", 110 "src/sans/models/c_models/onion.cpp", 110 111 srcdir+"/onion.c", 111 "s ans/models/c_models/CReflModel.cpp",112 "s ans/models/c_models/refl.cpp",112 "src/sans/models/c_models/CReflModel.cpp", 113 "src/sans/models/c_models/refl.cpp", 113 114 srcdir+"/refl.c", 114 "s ans/models/c_models/CReflAdvModel.cpp",115 "s ans/models/c_models/refl_adv.cpp",115 "src/sans/models/c_models/CReflAdvModel.cpp", 116 "src/sans/models/c_models/refl_adv.cpp", 116 117 srcdir+"/refl_adv.c", 117 118 #srcdir+"/SquareWell.c", 118 "s ans/models/c_models/CSquareWellStructure.cpp",119 "s ans/models/c_models/SquareWell.cpp",119 "src/sans/models/c_models/CSquareWellStructure.cpp", 120 "src/sans/models/c_models/SquareWell.cpp", 120 121 #srcdir+"/StickyHS.c", 121 "s ans/models/c_models/CStickyHSStructure.cpp",122 "s ans/models/c_models/StickyHS.cpp",123 "s ans/models/c_models/CHardsphereStructure.cpp",124 "s ans/models/c_models/Hardsphere.cpp",122 "src/sans/models/c_models/CStickyHSStructure.cpp", 123 "src/sans/models/c_models/StickyHS.cpp", 124 "src/sans/models/c_models/CHardsphereStructure.cpp", 125 "src/sans/models/c_models/Hardsphere.cpp", 125 126 #srcdir+"/DiamCyl.c", 126 "s ans/models/c_models/CDiamCylFunc.cpp",127 "s ans/models/c_models/DiamCyl.cpp",127 "src/sans/models/c_models/CDiamCylFunc.cpp", 128 "src/sans/models/c_models/DiamCyl.cpp", 128 129 #srcdir+"/DiamEllip.c", 129 "s ans/models/c_models/CDiamEllipFunc.cpp",130 "s ans/models/c_models/DiamEllip.cpp",130 "src/sans/models/c_models/CDiamEllipFunc.cpp", 131 "src/sans/models/c_models/DiamEllip.cpp", 131 132 #srcdir+"/HayterMSA.c", 132 "s ans/models/c_models/CHayterMSAStructure.cpp",133 "s ans/models/c_models/HayterMSA.cpp",134 "s ans/models/c_models/sphere.cpp",133 "src/sans/models/c_models/CHayterMSAStructure.cpp", 134 "src/sans/models/c_models/HayterMSA.cpp", 135 "src/sans/models/c_models/sphere.cpp", 135 136 srcdir+"/fuzzysphere.c", 136 "s ans/models/c_models/CFuzzySphereModel.cpp",137 "s ans/models/c_models/fuzzysphere.cpp",137 "src/sans/models/c_models/CFuzzySphereModel.cpp", 138 "src/sans/models/c_models/fuzzysphere.cpp", 138 139 #srcdir+"/CCylinderModel.c", 139 "s ans/models/c_models/CCylinderModel.cpp",140 "s ans/models/c_models/cylinder.cpp",141 "s ans/models/c_models/parameters.cpp",142 "s ans/models/c_models/dispersion_visitor.cpp",140 "src/sans/models/c_models/CCylinderModel.cpp", 141 "src/sans/models/c_models/cylinder.cpp", 142 "src/sans/models/c_models/parameters.cpp", 143 "src/sans/models/c_models/dispersion_visitor.cpp", 143 144 srcdir+"/cylinder.c", 144 145 #srcdir+"/CParallelepiped.c", 145 "s ans/models/c_models/CParallelepipedModel.cpp",146 "s ans/models/c_models/parallelepiped.cpp",146 "src/sans/models/c_models/CParallelepipedModel.cpp", 147 "src/sans/models/c_models/parallelepiped.cpp", 147 148 srcdir+"/parallelepiped.c", 148 "s ans/models/c_models/CCSParallelepipedModel.cpp",149 "s ans/models/c_models/csparallelepiped.cpp",149 "src/sans/models/c_models/CCSParallelepipedModel.cpp", 150 "src/sans/models/c_models/csparallelepiped.cpp", 150 151 srcdir+"/csparallelepiped.c", 151 152 #srcdir+"/CCoreShellCylinderModel.c", 152 "s ans/models/c_models/CCoreShellCylinderModel.cpp",153 "s ans/models/c_models/coreshellcylinder.cpp",153 "src/sans/models/c_models/CCoreShellCylinderModel.cpp", 154 "src/sans/models/c_models/coreshellcylinder.cpp", 154 155 srcdir+"/core_shell_cylinder.c", 155 156 #srcdir+"/CHollowCylinderModel.c", 156 "s ans/models/c_models/CHollowCylinderModel.cpp",157 "s ans/models/c_models/hollowcylinder.cpp",157 "src/sans/models/c_models/CHollowCylinderModel.cpp", 158 "src/sans/models/c_models/hollowcylinder.cpp", 158 159 srcdir+"/hollow_cylinder.c", 159 160 #srcdir+"/CCoreShellModel.c", 160 161 #srcdir+"/core_shell.c", 161 "s ans/models/c_models/CCoreShellModel.cpp",162 "s ans/models/c_models/coreshellsphere.cpp",162 "src/sans/models/c_models/CCoreShellModel.cpp", 163 "src/sans/models/c_models/coreshellsphere.cpp", 163 164 #srcdir+"/CEllipsoidModel.c", 164 "s ans/models/c_models/CEllipsoidModel.cpp",165 "s ans/models/c_models/ellipsoid.cpp",165 "src/sans/models/c_models/CEllipsoidModel.cpp", 166 "src/sans/models/c_models/ellipsoid.cpp", 166 167 srcdir+"/ellipsoid.c", 167 "s ans/models/c_models/CCoreFourShellModel.cpp",168 "s ans/models/c_models/corefourshell.cpp",168 "src/sans/models/c_models/CCoreFourShellModel.cpp", 169 "src/sans/models/c_models/corefourshell.cpp", 169 170 #srcdir+"/corefourshell.c", 170 171 #srcdir+"/CEllipticalCylinderModel.c", 171 "s ans/models/c_models/CEllipticalCylinderModel.cpp",172 "s ans/models/c_models/ellipticalcylinder.cpp",172 "src/sans/models/c_models/CEllipticalCylinderModel.cpp", 173 "src/sans/models/c_models/ellipticalcylinder.cpp", 173 174 srcdir+"/elliptical_cylinder.c", 174 175 #srcdir+"/CTriaxialEllipsoidModel.c", 175 "s ans/models/c_models/CTriaxialEllipsoidModel.cpp",176 "s ans/models/c_models/triaxialellipsoid.cpp",176 "src/sans/models/c_models/CTriaxialEllipsoidModel.cpp", 177 "src/sans/models/c_models/triaxialellipsoid.cpp", 177 178 srcdir+"/triaxial_ellipsoid.c", 178 179 #srcdir+"/CFlexibleCylinderModel.c", 179 "s ans/models/c_models/CFlexibleCylinderModel.cpp",180 "s ans/models/c_models/flexiblecylinder.cpp",180 "src/sans/models/c_models/CFlexibleCylinderModel.cpp", 181 "src/sans/models/c_models/flexiblecylinder.cpp", 181 182 srcdir+"/flexible_cylinder.c", 182 "s ans/models/c_models/CFlexCylEllipXModel.cpp",183 "s ans/models/c_models/flexcyl_ellipX.cpp",183 "src/sans/models/c_models/CFlexCylEllipXModel.cpp", 184 "src/sans/models/c_models/flexcyl_ellipX.cpp", 184 185 srcdir+"/flexcyl_ellipX.c", 185 "s ans/models/c_models/CBarBellModel.cpp",186 "s ans/models/c_models/barbell.cpp",186 "src/sans/models/c_models/CBarBellModel.cpp", 187 "src/sans/models/c_models/barbell.cpp", 187 188 srcdir+"/barbell.c", 188 "s ans/models/c_models/CCappedCylinderModel.cpp",189 "s ans/models/c_models/capcyl.cpp",189 "src/sans/models/c_models/CCappedCylinderModel.cpp", 190 "src/sans/models/c_models/capcyl.cpp", 190 191 srcdir+"/capcyl.c", 191 192 #srcdir+"/CStakedDisksModel.c", 192 "s ans/models/c_models/CSCCrystalModel.cpp",193 "s ans/models/c_models/sc.cpp",193 "src/sans/models/c_models/CSCCrystalModel.cpp", 194 "src/sans/models/c_models/sc.cpp", 194 195 srcdir+"/sc.c", 195 "s ans/models/c_models/CFCCrystalModel.cpp",196 "s ans/models/c_models/fcc.cpp",196 "src/sans/models/c_models/CFCCrystalModel.cpp", 197 "src/sans/models/c_models/fcc.cpp", 197 198 srcdir+"/fcc.c", 198 "s ans/models/c_models/CBCCrystalModel.cpp",199 "s ans/models/c_models/bcc.cpp",199 "src/sans/models/c_models/CBCCrystalModel.cpp", 200 "src/sans/models/c_models/bcc.cpp", 200 201 srcdir+"/bcc.c", 201 "s ans/models/c_models/CStackedDisksModel.cpp",202 "s ans/models/c_models/stackeddisks.cpp",202 "src/sans/models/c_models/CStackedDisksModel.cpp", 203 "src/sans/models/c_models/stackeddisks.cpp", 203 204 srcdir+"/stacked_disks.c", 204 205 #srcdir+"/CLamellarModel.c", 205 "s ans/models/c_models/CLamellarModel.cpp",206 "s ans/models/c_models/lamellar.cpp",206 "src/sans/models/c_models/CLamellarModel.cpp", 207 "src/sans/models/c_models/lamellar.cpp", 207 208 srcdir+"/lamellar.c", 208 209 #srcdir+"/CLamellarFFHGModel.c", 209 "s ans/models/c_models/CLamellarFFHGModel.cpp",210 "s ans/models/c_models/lamellarFF_HG.cpp",210 "src/sans/models/c_models/CLamellarFFHGModel.cpp", 211 "src/sans/models/c_models/lamellarFF_HG.cpp", 211 212 #srcdir+"/lamellarFF_HG.c", 212 213 #srcdir+"/CLamellarPSModel.c", 213 "s ans/models/c_models/CLamellarPSModel.cpp",214 "s ans/models/c_models/lamellarPS.cpp",214 "src/sans/models/c_models/CLamellarPSModel.cpp", 215 "src/sans/models/c_models/lamellarPS.cpp", 215 216 srcdir+"/lamellarPS.c", 216 217 #srcdir+"/CLamellarPSHGModel.c", 217 "s ans/models/c_models/CLamellarPSHGModel.cpp",218 "s ans/models/c_models/lamellarPS_HG.cpp",218 "src/sans/models/c_models/CLamellarPSHGModel.cpp", 219 "src/sans/models/c_models/lamellarPS_HG.cpp", 219 220 #srcdir+"/lamellarPS_HG.c", 220 "s ans/models/c_models/CLamellarPCrystalModel.cpp",221 "s ans/models/c_models/lamellarPC.cpp",221 "src/sans/models/c_models/CLamellarPCrystalModel.cpp", 222 "src/sans/models/c_models/lamellarPC.cpp", 222 223 #srcdir+"/lamellarPC.c", 223 224 #srcdir+"/COblateModel.c", 224 "s ans/models/c_models/CCoreShellEllipsoidModel.cpp",225 "s ans/models/c_models/spheroid.cpp",225 "src/sans/models/c_models/CCoreShellEllipsoidModel.cpp", 226 "src/sans/models/c_models/spheroid.cpp", 226 227 srcdir+"/spheroid.c", 227 228 #srcdir+"/COblateModel.c", … … 234 235 #srcdir+"/prolate.c", 235 236 #srcdir+"/CMultishellModel.c", 236 "s ans/models/c_models/CMultiShellModel.cpp",237 "s ans/models/c_models/multishell.cpp",237 "src/sans/models/c_models/CMultiShellModel.cpp", 238 "src/sans/models/c_models/multishell.cpp", 238 239 #srcdir+"/multishell.c", 239 "s ans/models/c_models/CSphereSLDModel.cpp",240 "s ans/models/c_models/spheresld.cpp",240 "src/sans/models/c_models/CSphereSLDModel.cpp", 241 "src/sans/models/c_models/spheresld.cpp", 241 242 srcdir+"/spheresld.c", 242 243 #srcdir+"/CVesicleModel.c", 243 "s ans/models/c_models/CVesicleModel.cpp",244 "s ans/models/c_models/vesicle.cpp",244 "src/sans/models/c_models/CVesicleModel.cpp", 245 "src/sans/models/c_models/vesicle.cpp", 245 246 #srcdir+"/vesicle.c", 246 247 #srcdir+"/CBinaryHSModel.c", 247 "s ans/models/c_models/CBinaryHSModel.cpp",248 "s ans/models/c_models/binaryHS.cpp",249 "s ans/models/c_models/CPoly_GaussCoil.cpp",250 "s ans/models/c_models/polygausscoil.cpp",248 "src/sans/models/c_models/CBinaryHSModel.cpp", 249 "src/sans/models/c_models/binaryHS.cpp", 250 "src/sans/models/c_models/CPoly_GaussCoil.cpp", 251 "src/sans/models/c_models/polygausscoil.cpp", 251 252 srcdir+"/rpa.c", 252 "s ans/models/c_models/CRPAModel.cpp",253 "s ans/models/c_models/rpa.cpp",253 "src/sans/models/c_models/CRPAModel.cpp", 254 "src/sans/models/c_models/rpa.cpp", 254 255 #srcdir+"/fractal.c", 255 "s ans/models/c_models/CFractalModel.cpp",256 "s ans/models/c_models/fractal.cpp",256 "src/sans/models/c_models/CFractalModel.cpp", 257 "src/sans/models/c_models/fractal.cpp", 257 258 srcdir+"/sld_cal.c", 258 "s ans/models/c_models/CSLDCalFunc.cpp",259 "s ans/models/c_models/sld_cal.cpp",259 "src/sans/models/c_models/CSLDCalFunc.cpp", 260 "src/sans/models/c_models/sld_cal.cpp", 260 261 #gammainc function need to imported from somewhere 261 262 #srcdir+"/polyexclvol.c", … … 280 281 srcdir+"/CLorentzian.c" 281 282 ], 282 include_dirs=[igordir,srcdir,"s ans/models/c_models",numpy_incl_path]),283 include_dirs=[igordir,srcdir,"src/sans/models/c_models",numpy_incl_path]), 283 284 # Smearer extension 284 285 Extension("sans.models.sans_extension.smearer", 285 286 sources = [ 286 "s ans/models/c_smearer/smearer_module.cpp",287 "s ans/models/c_smearer/smearer.cpp",287 "src/sans/models/c_smearer/smearer_module.cpp", 288 "src/sans/models/c_smearer/smearer.cpp", 288 289 ], 289 include_dirs=["s ans/models/c_smearer",numpy_incl_path]),290 include_dirs=["src/sans/models/c_smearer",numpy_incl_path]), 290 291 Extension("sans.models.sans_extension.smearer2d_helper", 291 292 sources = [ 292 "s ans/models/c_smearer/smearer2d_helper_module.cpp",293 "s ans/models/c_smearer/smearer2d_helper.cpp",293 "src/sans/models/c_smearer/smearer2d_helper_module.cpp", 294 "src/sans/models/c_smearer/smearer2d_helper.cpp", 294 295 ], 295 include_dirs=["s ans/models/c_smearer",numpy_incl_path]296 include_dirs=["src/sans/models/c_smearer",numpy_incl_path] 296 297 ) 297 298 ]
Note: See TracChangeset
for help on using the changeset viewer.
