Changeset a8d3b4f in sasview

Timestamp:

Jul 24, 2012 5:09:30 AM (12 years ago)

Author:

Kieran Campbell <kieranrcampbell@…>

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:

8389beb

Parents:

3df5ecf

Message:

Added star polymer with gaussian statistics model

Files:

• fittingview/src/sans/perspectives/fitting/models.py (modified) (2 diffs)
• sansmodels/include/starpolymer.h (added)
• sansmodels/src/c_models/starpolymer.cpp (added)

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

@@ -336 +336 @@
         self.multiplication_factor.append(SphericalSLDModel)
         self.multi_func_list.append(SphericalSLDModel)
+
+        from sans.models.StarPolymer import StarPolymer
+        self.shape_list.append(StarPolymer)
+        self.model_name_list.append(StarPolymer.__name__)
         
         from sans.models.LinearPearlsModel import LinearPearlsModel
@@ -469 +473 @@
         self.struct_list.append(HayterMSAStructure)
         self.model_name_list.append(HayterMSAStructure.__name__)
-        
+
+
         ##shape-independent models
         from sans.models.PowerLawAbsModel import PowerLawAbsModel