Changeset 35aface in sasview for sansmodels/src/sans/models/CoreMultiShellModel.py

Timestamp:

Oct 6, 2010 4:54:35 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:

fbae881

Parents:

6d48919

Message:

addede new models and attr. non_fittable

File:

• sansmodels/src/sans/models/CoreMultiShellModel.py (modified) (4 diffs)

sansmodels/src/sans/models/CoreMultiShellModel.py

@@ -9 +9 @@
     of changing the number of shells between 1 and 4.
     """
-    def __init__(self, n_shells=4):
+    def __init__(self, multfactor=1):
         BaseComponent.__init__(self)
         """
@@ -21 +21 @@
         self.name = "CoreMultiShellModel"
         self.description=""
-        self.n_shells = n_shells
+        self.n_shells = multfactor
         ## Define parameters
         self.params = {}
@@ -27 +27 @@
         ## Parameter details [units, min, max]
         self.details = {}
+        
+        # non-fittable parameters
+        self.non_fittable = model.non_fittable
         
         ## dispersion
@@ -39 +42 @@
         self._set_fixed_params()  
         
+        ## functional multiplicity of the model
+        self.multiplicity = 5
         ## parameters with orientation: can be removed since there is no orientational params
         for item in self.model.orientation_params: