Changeset 1a395a6 in sasview

Timestamp:

Nov 1, 2010 2:35:14 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:

96c0234

Parents:

96d19c6

Message:

added new models

Files:

• sansview/perspectives/fitting/models.py (modified) (2 diffs)
• theoryview/perspectives/theory/models.py (modified) (3 diffs)

sansview/perspectives/fitting/models.py

@@ -176 +176 @@
         self.multiplication_factor.append(SphereModel)
         
-        from sans.models.SphereExpShellModel import SphereExpShellModel
-        self.shape_list.append(SphereExpShellModel)
-        self.multiplication_factor.append(SphereExpShellModel)
-        self.multi_func_list.append(SphereExpShellModel)
-        
+        from sans.models.BinaryHSModel import BinaryHSModel
+        self.shape_list.append(BinaryHSModel)
+                        
         from sans.models.FuzzySphereModel import FuzzySphereModel
         self.shape_list.append(FuzzySphereModel)
@@ -202 +200 @@
         self.multiplication_factor.append(MultiShellModel)
         
-        from sans.models.BinaryHSModel import BinaryHSModel
-        self.shape_list.append(BinaryHSModel)
+        from sans.models.OnionExpShellModel import OnionExpShellModel
+        self.shape_list.append(OnionExpShellModel)
+        self.multiplication_factor.append(OnionExpShellModel)
+        self.multi_func_list.append(OnionExpShellModel)
+                        
+        from sans.models.SphericalSLDModel import SphericalSLDModel
+        self.shape_list.append(SphericalSLDModel)
+        self.multiplication_factor.append(SphericalSLDModel)
+        self.multi_func_list.append(SphericalSLDModel)
         
         from sans.models.CylinderModel import CylinderModel

theoryview/perspectives/theory/models.py

@@ -184 +184 @@
         self.shape_list.append(SphereModel)
         self.multiplication_factor.append(SphereModel)
-        
-        from sans.models.SphereExpShellModel import SphereExpShellModel
-        self.shape_list.append(SphereExpShellModel)
-        self.multiplication_factor.append(SphereExpShellModel)
-        self.multi_func_list.append(SphereExpShellModel)
+              
+        from sans.models.BinaryHSModel import BinaryHSModel
+        self.shape_list.append(BinaryHSModel)
         
         from sans.models.FuzzySphereModel import FuzzySphereModel
@@ -211 +209 @@
         self.multiplication_factor.append(MultiShellModel)
         
-        from sans.models.BinaryHSModel import BinaryHSModel
-        self.shape_list.append(BinaryHSModel)
+        from sans.models.OnionExpShellModel import OnionExpShellModel
+        self.shape_list.append(OnionExpShellModel)
+        self.multiplication_factor.append(OnionExpShellModel)
+        self.multi_func_list.append(OnionExpShellModel)  
+        
+        from sans.models.SphericalSLDModel import SphericalSLDModel
+        self.shape_list.append(SphericalSLDModel)
+        self.multiplication_factor.append(SphericalSLDModel)
+        self.multi_func_list.append(SphericalSLDModel)
+        
         
         from sans.models.CylinderModel import CylinderModel
@@ -385 +391 @@
         from sans.models.ReflectivityModel import ReflectivityModel
         self.multi_func_list.append(ReflectivityModel)
-    
+        
         #Looking for plugins
         self.plugins = findModels()