Changeset 89c0919 in sasview for sansmodels/src

Timestamp:

Apr 12, 2010 2:03:49 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:

8dcfb2e

Parents:

04349fe

Message:

added new model

File:

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

sansmodels/src/setup.py

@@ -119 +119 @@
         "sans/models/c_models/HayterMSA.cpp",             
         "sans/models/c_models/sphere.cpp",
+        srcdir+"/fuzzysphere.c",
+        "sans/models/c_models/CFuzzySphereModel.cpp",
+        "sans/models/c_models/fuzzysphere.cpp",
         #srcdir+"/CCylinderModel.c",
         "sans/models/c_models/CCylinderModel.cpp",
@@ -145 +148 @@
         "sans/models/c_models/ellipsoid.cpp",        
         srcdir+"/ellipsoid.c",
+        "sans/models/c_models/CCoreFourShellModel.cpp",
+        "sans/models/c_models/corefourshell.cpp",
+        srcdir+"/corefourshell.c",
         #srcdir+"/CEllipticalCylinderModel.c",
         "sans/models/c_models/CEllipticalCylinderModel.cpp",
@@ -157 +163 @@
         "sans/models/c_models/flexiblecylinder.cpp",                
         srcdir+"/flexible_cylinder.c",
+        "sans/models/c_models/CFlexCylEllipXModel.cpp",
+        "sans/models/c_models/flexcyl_ellipX.cpp",         
+        srcdir+"/flexcyl_ellipX.c",
         #srcdir+"/CStakedDisksModel.c",
         "sans/models/c_models/CStackedDisksModel.cpp",
@@ -200 +209 @@
         "sans/models/c_models/CBinaryHSModel.cpp",
         "sans/models/c_models/binaryHS.cpp",                
+        "sans/models/c_models/CPoly_GaussCoil.cpp",
+        "sans/models/c_models/polygausscoil.cpp",   
+        srcdir+"/fractal.c",             
+        "sans/models/c_models/CFractalModel.cpp",
+        "sans/models/c_models/fractal.cpp", 
+        
+        #gammainc function need to imported from somewhere  
+        #srcdir+"/polyexclvol.c",             
+        #"sans/models/c_models/CPolymerExclVolModel.cpp",
+        #"sans/models/c_models/polyexclvol.cpp",  
+         
+        srcdir+"/polygausscoil.c",             
         srcdir+"/binaryHS.c",
         srcdir+"/disperser.c",
@@ -205 +226 @@
         igordir+"/libStructureFactor.c",
         igordir+"/libSphere.c",
+        igordir+"/libTwoPhase.c",
         srcdir+"/gaussian.c",
         srcdir+"/CGaussian.c",