Changeset 3764dbd7 in sasview

Timestamp:

May 7, 2012 3:16:38 PM (12 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:

2ad3601

Parents:

6b53d2e

Message:

raspberry model

Files:

• fittingview/src/sans/perspectives/fitting/models.py (modified) (1 diff)
• sansmodels/include/raspberry.h (added)
• sansmodels/src/c_models/c_models.cpp (modified) (2 diffs)
• sansmodels/src/c_models/raspberry.cpp (added)
• sansmodels/test/polyraspberry_igor.txt (added)
• sansmodels/test/raspberry_igor.txt (added)

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

@@ -298 +298 @@
         self.multiplication_factor.append(FuzzySphereModel)
         self.model_name_list.append(FuzzySphereModel.__name__)
-        
+                        
+        from sans.models.RaspBerryModel import RaspBerryModel
+        self.shape_list.append(RaspBerryModel)
+        self.model_name_list.append(RaspBerryModel.__name__)
+                
         from sans.models.CoreShellModel import CoreShellModel
         self.shape_list.append(CoreShellModel)

sansmodels/src/c_models/c_models.cpp

@@ -25 +25 @@
 void addCReflAdvModel(PyObject *module);
 void addCFuzzySphereModel(PyObject *module);
+void addCRaspBerryModel(PyObject *module);
 void addCHardsphereStructure(PyObject *module);
 void addCStickyHSStructure(PyObject *module);
@@ -266 +267 @@
   addCReflAdvModel(m);
   addCFuzzySphereModel(m);
+  addCRaspBerryModel(m);
   addCHardsphereStructure(m);
   addCStickyHSStructure(m);