Changeset e65050e in sasview for sansview

Timestamp:

Jul 1, 2009 10:56:08 AM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

6b4decc

Parents:

34c3020

Message:

add 1D form factor to sansview

File:

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

sansview/perspectives/fitting/models.py

@@ -127 +127 @@
         self.multiplication_factor.append(CylinderModel)
         
-        #from sans.models.ParallelepipedModel import ParallelepipedModel
-        #self.shape_list.append(ParallelepipedModel)
-        #self.multiplication_factor.append(ParallelepipedModel)
+        from sans.models.ParallelepipedModel import ParallelepipedModel
+        self.shape_list.append(ParallelepipedModel)
+        self.multiplication_factor.append(ParallelepipedModel)
         
         from sans.models.CoreShellModel import CoreShellModel
@@ -144 +144 @@
         self.multiplication_factor.append(EllipsoidModel)
          
-        
+        from sans.models.TriaxialEllipsoidModel import TriaxialEllipsoidModel
+        self.shape_list.append(TriaxialEllipsoidModel)
+        self.multiplication_factor.append(TriaxialEllipsoidModel)
+        
+        from sans.models.FlexibleCylinderModel import FlexibleCylinderModel
+        self.shape_list.append(FlexibleCylinderModel)
+        self.multiplication_factor.append(FlexibleCylinderModel)
+        
+        from sans.models.StackedDisksModel import StackedDisksModel
+        self.shape_list.append(StackedDisksModel)
+        self.multiplication_factor.append(StackedDisksModel)
+        
+        from sans.models.LamellarModel import LamellarModel
+        self.shape_list.append(LamellarModel)
+        self.multiplication_factor.append(LamellarModel)
+        
+        from sans.models.LamellarFFHGModel import LamellarFFHGModel
+        self.shape_list.append(LamellarFFHGModel)
+        self.multiplication_factor.append(LamellarFFHGModel)
+        
+        from sans.models.LamellarPSModel import LamellarPSModel
+        self.shape_list.append(LamellarPSModel)
+        self.multiplication_factor.append(LamellarPSModel)
+        
+        from sans.models.LamellarPSHGModel import LamellarPSHGModel
+        self.shape_list.append(LamellarPSHGModel)
+        self.multiplication_factor.append(LamellarPSHGModel)
+        
+        from sans.models.OblateModel import OblateModel
+        self.shape_list.append(OblateModel)
+        self.multiplication_factor.append(OblateModel)
+        
+        from sans.models.ProlateModel import ProlateModel
+        self.shape_list.append(ProlateModel)
+        self.multiplication_factor.append(ProlateModel)
         
         ## Structure factor 
-      
         from sans.models.SquareWellStructure import SquareWellStructure
         self.struct_list.append(SquareWellStructure)