Changeset aaad3098 in sasview for sansmodels/src

Timestamp:

Oct 8, 2010 7:47:56 PM (14 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:

339ce67

Parents:

d2d815d

Message:

pclamella removed from list until they are ready

Location:

sansmodels/src

Files:

• sans/models/c_models/c_models.cpp (modified) (2 diffs)
• setup.py (modified) (1 diff)

sansmodels/src/sans/models/c_models/c_models.cpp

@@ -36 +36 @@
 void addCLamellarPSModel(PyObject *module);
 void addCLamellarPSHGModel(PyObject *module);
-void addCLamellarPCrystalModel(PyObject *module);
+//void addCLamellarPCrystalModel(PyObject *module);
 void addCCoreShellEllipsoidModel(PyObject *module);
 void addCDiamEllipFunc(PyObject *module);
@@ -245 +245 @@
         addCLamellarPSModel(m);
         addCLamellarPSHGModel(m);
-        addCLamellarPCrystalModel(m);
+        //addCLamellarPCrystalModel(m);
         addCCoreShellEllipsoidModel(m);
         addCDiamEllipFunc(m);

sansmodels/src/setup.py

@@ -201 +201 @@
         "sans/models/c_models/lamellarPS_HG.cpp",                
         srcdir+"/lamellarPS_HG.c",
-        "sans/models/c_models/CLamellarPCrystalModel.cpp",
-        "sans/models/c_models/lamellarPC.cpp",                
-        srcdir+"/lamellarPC.c",
+        #"sans/models/c_models/CLamellarPCrystalModel.cpp",
+        #"sans/models/c_models/lamellarPC.cpp",                
+        #srcdir+"/lamellarPC.c",
         #srcdir+"/COblateModel.c",
         "sans/models/c_models/CCoreShellEllipsoidModel.cpp",