Changeset 0211d67 in sasview for sansmodels

Timestamp:

Oct 10, 2009 1:26:51 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

d38d2230

Parents:

ea2aa224

Message:

corrected case of multilshell name, and added python2.6 path for linux. Todo: assign universal h (lib numpy) path.

File:

• sansmodels/src/setup.py (modified) (2 diffs)

sansmodels/src/setup.py

@@ -13 +13 @@
 import os
 
-numpy_incl_path = os.path.join(sys.prefix, "Lib", "site-packages", "numpy", "core", "include", "numpy")
-
-
+if sys.platform.count("win32")>0:
+    numpy_incl_path = os.path.join(sys.prefix, "Lib", "site-packages", "numpy", "core", "include", "numpy")
+else:
+    numpy_incl_path = os.path.join(sys.prefix, "lib","python2.6", "site-packages", "numpy", "core", "include", "numpy")
 
 def createODBcontent(class_name):
@@ -191 +192 @@
         #srcdir+"/prolate.c",
         #srcdir+"/CMultishellModel.c",
-        "sans/models/c_models/CMultishellModel.cpp",
+        "sans/models/c_models/CMultiShellModel.cpp",
         "sans/models/c_models/multishell.cpp",                
         srcdir+"/multishell.c",