Changeset 0f5bc9f in sasview for sansmodels/src/setup.py

Timestamp:

Aug 19, 2008 2:42:22 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

d30fdde

Parents:

a86bbe9

Message:

Update of all C models to the new style of C++ models

File:

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

sansmodels/src/setup.py

@@ -93 +93 @@
      sources = [
         srcdir+"/c_models.cpp",
-        srcdir+"/CSphereModel.c",
-        srcdir+"/sphere.c",
+        #srcdir+"/CSphereModel.c",
+        #srcdir+"/sphere.c",
+        "sans/models/c_models/CSphereModel.cpp",
+        "sans/models/c_models/sphere.cpp",
         #srcdir+"/CCylinderModel.c",
         "sans/models/c_models/CCylinderModel.cpp",
@@ -101 +103 @@
         "sans/models/c_models/dispersion_visitor.cpp",
         srcdir+"/cylinder.c",
-        srcdir+"/CCoreShellCylinderModel.c",
+        #srcdir+"/CCoreShellCylinderModel.c",
+        "sans/models/c_models/CCoreShellCylinderModel.cpp",
+        "sans/models/c_models/coreshellcylinder.cpp",
         srcdir+"/core_shell_cylinder.c",
-        srcdir+"/CCoreShellModel.c",
-        srcdir+"/core_shell.c",
-        srcdir+"/CEllipsoidModel.c",
+        #srcdir+"/CCoreShellModel.c",
+        #srcdir+"/core_shell.c",
+        "sans/models/c_models/CCoreShellModel.cpp",
+        "sans/models/c_models/coreshellsphere.cpp",
+        #srcdir+"/CEllipsoidModel.c",
+        "sans/models/c_models/CEllipsoidModel.cpp",
+        "sans/models/c_models/ellipsoid.cpp",        
         srcdir+"/ellipsoid.c",
-        srcdir+"/CEllipticalCylinderModel.c",
+        #srcdir+"/CEllipticalCylinderModel.c",
+        "sans/models/c_models/CEllipticalCylinderModel.cpp",
+        "sans/models/c_models/ellipticalcylinder.cpp",                
         srcdir+"/elliptical_cylinder.c",
         srcdir+"/disperser.c",