Changeset d9547e7 in sasview

Timestamp:

Feb 1, 2012 10:20:23 AM (13 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:

9ede123

Parents:

1ba8201d

Message:

Added linearpearlsmodel and a test

Files:

• fittingview/src/sans/perspectives/fitting/models.py (modified) (1 diff)
• sansmodels/include/linearpearls.h (added)
• sansmodels/src/c_models/c_models.cpp (modified) (2 diffs)
• sansmodels/src/c_models/linearpearls.cpp (added)
• sansmodels/test/utest_model_pearlnecklace.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/models.py

@@ -318 +318 @@
         self.multi_func_list.append(SphericalSLDModel)
         
+        from sans.models.LinearPearlsModel import LinearPearlsModel
+        self.shape_list.append(LinearPearlsModel)
+        self.model_name_list.append(LinearPearlsModel.__name__)
+          
         from sans.models.PearlNecklaceModel import PearlNecklaceModel
         self.shape_list.append(PearlNecklaceModel)

sansmodels/src/c_models/c_models.cpp

@@ -20 +20 @@
 void addCSphereSLDModel(PyObject *module);
 void addCOnionModel(PyObject *module);
+void addCLinearPearlsModel(PyObject *module);
 void addCPearlNecklaceModel(PyObject *module);
 void addCReflModel(PyObject *module);
@@ -277 +278 @@
   addCDiamCylFunc(m);
   addCSLDCalFunc(m);
+  addCLinearPearlsModel(m);
   addCPearlNecklaceModel(m);
   addCLamellarModel(m);

sansmodels/test/utest_model_pearlnecklace.py

@@ -11 +11 @@
         from sans.models.PearlNecklaceModel import PearlNecklaceModel
         self.pnl = PearlNecklaceModel()
+        from sans.models.LinearPearlsModel import LinearPearlsModel
+        self.lpm = LinearPearlsModel()
         from sans.models.SphereModel import SphereModel
         self.sphere = SphereModel()
@@ -44 +46 @@
         self.bar.setParam("rad_bar", 0.1)
         self.bar.setParam("rad_bell", 20)
-        
+        self.lpm.setParam("radius", 20)
+        self.lpm.setParam("num_pearls", 2)
+        self.lpm.setParam("sld_pearl", 1e-06)
+        self.lpm.setParam("sld_solv", 6.3e-06)
+        self.lpm.setParam("edge_separation", 400)
+                
         self.assertAlmostEqual(self.pnl.run(0.001), self.bar.run(0.001), 1)
         self.assertAlmostEqual(self.pnl.run(0.005), self.bar.run(0.005), 1)
@@ -52 +59 @@
         self.assertAlmostEqual(self.pnl.run(0.5), self.bar.run(0.5), 1)
         
+        self.assertAlmostEqual(self.pnl.run(0.001), self.lpm.run(0.001), 1)
+        self.assertAlmostEqual(self.pnl.run(0.005), self.lpm.run(0.005), 1)
+        self.assertAlmostEqual(self.pnl.run(0.01), self.lpm.run(0.01), 1)
+        self.assertAlmostEqual(self.pnl.run(0.05), self.lpm.run(0.05), 1)
+        self.assertAlmostEqual(self.pnl.run(0.1), self.lpm.run(0.1), 1)
+        self.assertAlmostEqual(self.pnl.run(0.5), self.lpm.run(0.5), 1)