Changeset eddff027 in sasview for sansview

Timestamp:

Aug 18, 2009 12:39:37 PM (15 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:

7df26c3

Parents:

3c102d4

Message:

added coreshellellipsoidmodel

File:

• sansview/perspectives/fitting/models.py (modified) (5 diffs)

sansview/perspectives/fitting/models.py

@@ -119 +119 @@
         self.multiplication_factor.append(SphereModel)
         
+        from sans.models.CoreShellModel import CoreShellModel
+        self.shape_list.append(CoreShellModel)
+        
+        from sans.models.MultiShellModel import MultiShellModel
+        self.shape_list.append(MultiShellModel)
+        
+        from sans.models.VesicleModel import VesicleModel
+        self.shape_list.append(VesicleModel)
+        
+        from sans.models.BinaryHSModel import BinaryHSModel
+        self.shape_list.append(BinaryHSModel)
+        
         from sans.models.CylinderModel import CylinderModel
         self.shape_list.append(CylinderModel)
         self.multiplication_factor.append(CylinderModel)
         
+        from sans.models.CoreShellCylinderModel import CoreShellCylinderModel
+        self.shape_list.append(CoreShellCylinderModel)
+        
+        from sans.models.HollowCylinderModel import HollowCylinderModel
+        self.shape_list.append(HollowCylinderModel)
+              
+        from sans.models.FlexibleCylinderModel import FlexibleCylinderModel
+        self.shape_list.append(FlexibleCylinderModel)
+        
+        from sans.models.StackedDisksModel import StackedDisksModel
+        self.shape_list.append(StackedDisksModel)
+        
         from sans.models.ParallelepipedModel import ParallelepipedModel
         self.shape_list.append(ParallelepipedModel)
-        
-        from sans.models.CoreShellModel import CoreShellModel
-        self.shape_list.append(CoreShellModel)
-        
-        from sans.models.CoreShellCylinderModel import CoreShellCylinderModel
-        self.shape_list.append(CoreShellCylinderModel)
-        
-        from sans.models.MultiShellModel import MultiShellModel
-        self.shape_list.append(MultiShellModel)
-        
-        from sans.models.BinaryHSModel import BinaryHSModel
-        self.shape_list.append(BinaryHSModel)
-        
-        from sans.models.VesicleModel import VesicleModel
-        self.shape_list.append(VesicleModel)
-        
-        from sans.models.HollowCylinderModel import HollowCylinderModel
-        self.shape_list.append(HollowCylinderModel)
         
         from sans.models.EllipticalCylinderModel import EllipticalCylinderModel
@@ -150 +156 @@
         self.shape_list.append(EllipsoidModel)
         self.multiplication_factor.append(EllipsoidModel)
+      
+        from sans.models.CoreShellEllipsoidModel import CoreShellEllipsoidModel
+        self.shape_list.append(CoreShellEllipsoidModel)
          
         from sans.models.TriaxialEllipsoidModel import TriaxialEllipsoidModel
         self.shape_list.append(TriaxialEllipsoidModel)
-       
-        from sans.models.FlexibleCylinderModel import FlexibleCylinderModel
-        self.shape_list.append(FlexibleCylinderModel)
-        
-        from sans.models.StackedDisksModel import StackedDisksModel
-        self.shape_list.append(StackedDisksModel)
         
         from sans.models.LamellarModel import LamellarModel
@@ -172 +175 @@
         self.shape_list.append(LamellarPSHGModel)
       
-        from sans.models.OblateModel import OblateModel
-        self.shape_list.append(OblateModel)
-        
-        from sans.models.ProlateModel import ProlateModel
-        self.shape_list.append(ProlateModel)
-      
         ## Structure factor 
         from sans.models.SquareWellStructure import SquareWellStructure
@@ -207 +204 @@
         from sans.models.PorodModel import PorodModel
         self.shape_indep_list.append(PorodModel )
-        
-        from sans.models.LineModel import LineModel
-        self.shape_indep_list.append(LineModel)
         
         from sans.models.PeakGaussModel import PeakGaussModel
@@ -236 +230 @@
         from sans.models.TeubnerStreyModel import TeubnerStreyModel
         self.shape_indep_list.append(TeubnerStreyModel )
+        
+        from sans.models.LineModel import LineModel
+        self.shape_indep_list.append(LineModel)
     
         #Looking for plugins