Changeset ce07fa8 in sasview

Timestamp:

Apr 12, 2010 10:39:08 AM (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:

018a0bd

Parents:

19107f0

Message:

added more models

Files:

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

sansview/perspectives/fitting/models.py

@@ -166 +166 @@
         self.multiplication_factor.append(SphereModel)
         
+        from sans.models.FuzzySphereModel import FuzzySphereModel
+        self.shape_list.append(FuzzySphereModel)
+        self.multiplication_factor.append(FuzzySphereModel)
+        
         from sans.models.CoreShellModel import CoreShellModel
         self.shape_list.append(CoreShellModel)
         self.multiplication_factor.append(CoreShellModel)
+
+        from sans.models.CoreFourShellModel import CoreFourShellModel
+        self.shape_list.append(CoreFourShellModel)
+        self.multiplication_factor.append(CoreFourShellModel)
         
         from sans.models.VesicleModel import VesicleModel
@@ -196 +204 @@
         self.shape_list.append(FlexibleCylinderModel)
 
+        from sans.models.FlexCylEllipXModel import FlexCylEllipXModel
+        self.shape_list.append(FlexCylEllipXModel)
         
         from sans.models.StackedDisksModel import StackedDisksModel
@@ -248 +258 @@
         
         ##shape-independent models
+            
+        from sans.models.PowerLawAbsModel import PowerLawAbsModel
+        self.shape_indep_list.append( PowerLawAbsModel )
+        
         from sans.models.BEPolyelectrolyte import BEPolyelectrolyte
         self.shape_indep_list.append(BEPolyelectrolyte )
         self.form_factor_dict[str(wx.NewId())] =  [SphereModel]
+
         from sans.models.DABModel import DABModel
         self.shape_indep_list.append(DABModel )
         
+        from sans.models.DebyeModel import DebyeModel
+        self.shape_indep_list.append(DebyeModel )
+        
         from sans.models.GuinierModel import GuinierModel
         self.shape_indep_list.append(GuinierModel )
         
-        from sans.models.DebyeModel import DebyeModel
-        self.shape_indep_list.append(DebyeModel )
-        
+        from sans.models.FractalModel import FractalModel
+        self.shape_indep_list.append(FractalModel )
+        
+        from sans.models.LorentzModel import LorentzModel
+        self.shape_indep_list.append( LorentzModel) 
+        
+        from sans.models.PeakGaussModel import PeakGaussModel
+        self.shape_indep_list.append(PeakGaussModel)
+        
+        from sans.models.PeakLorentzModel import PeakLorentzModel
+        self.shape_indep_list.append(PeakLorentzModel)
+        
+        from sans.models.Poly_GaussCoil import Poly_GaussCoil
+        self.shape_indep_list.append(Poly_GaussCoil)
+                 
         from sans.models.PorodModel import PorodModel
         self.shape_indep_list.append(PorodModel )
         
-        from sans.models.PeakGaussModel import PeakGaussModel
-        self.shape_indep_list.append(PeakGaussModel)
-        
-        from sans.models.PeakLorentzModel import PeakLorentzModel
-        self.shape_indep_list.append(PeakLorentzModel)
-        
-        from sans.models.FractalAbsModel import FractalAbsModel
-        self.shape_indep_list.append(FractalAbsModel)
-        
-        from sans.models.LorentzModel import LorentzModel
-        self.shape_indep_list.append( LorentzModel) 
-            
-        from sans.models.PowerLawAbsModel import PowerLawAbsModel
-        self.shape_indep_list.append( PowerLawAbsModel )
+        
+        #FractalModel (a c-model)will be used.
+        #from sans.models.FractalAbsModel import FractalAbsModel
+        #self.shape_indep_list.append(FractalAbsModel)
         
         from sans.models.TeubnerStreyModel import TeubnerStreyModel
@@ -283 +303 @@
         from sans.models.LineModel import LineModel
         self.shape_indep_list.append(LineModel)
+
     
         #Looking for plugins

theoryview/perspectives/theory/models.py

@@ -166 +166 @@
         self.multiplication_factor.append(SphereModel)
         
+        from sans.models.FuzzySphereModel import FuzzySphereModel
+        self.shape_list.append(FuzzySphereModel)
+        self.multiplication_factor.append(FuzzySphereModel)
+           
         from sans.models.CoreShellModel import CoreShellModel
         self.shape_list.append(CoreShellModel)
         self.multiplication_factor.append(CoreShellModel)
+
+        from sans.models.CoreFourShellModel import CoreFourShellModel
+        self.shape_list.append(CoreFourShellModel)
+        self.multiplication_factor.append(CoreFourShellModel)
         
         from sans.models.VesicleModel import VesicleModel
@@ -196 +204 @@
         self.shape_list.append(FlexibleCylinderModel)
 
+        from sans.models.FlexCylEllipXModel import FlexCylEllipXModel
+        self.shape_list.append(FlexCylEllipXModel)
         
         from sans.models.StackedDisksModel import StackedDisksModel
@@ -248 +258 @@
         
         ##shape-independent models
+            
+        from sans.models.PowerLawAbsModel import PowerLawAbsModel
+        self.shape_indep_list.append( PowerLawAbsModel )
+        
         from sans.models.BEPolyelectrolyte import BEPolyelectrolyte
         self.shape_indep_list.append(BEPolyelectrolyte )
         self.form_factor_dict[str(wx.NewId())] =  [SphereModel]
+
         from sans.models.DABModel import DABModel
         self.shape_indep_list.append(DABModel )
         
+        from sans.models.DebyeModel import DebyeModel
+        self.shape_indep_list.append(DebyeModel )
+        
         from sans.models.GuinierModel import GuinierModel
         self.shape_indep_list.append(GuinierModel )
         
-        from sans.models.DebyeModel import DebyeModel
-        self.shape_indep_list.append(DebyeModel )
-        
+        from sans.models.FractalModel import FractalModel
+        self.shape_indep_list.append(FractalModel )
+        
+        from sans.models.LorentzModel import LorentzModel
+        self.shape_indep_list.append( LorentzModel) 
+        
+        from sans.models.PeakGaussModel import PeakGaussModel
+        self.shape_indep_list.append(PeakGaussModel)
+        
+        from sans.models.PeakLorentzModel import PeakLorentzModel
+        self.shape_indep_list.append(PeakLorentzModel)
+        
+        from sans.models.Poly_GaussCoil import Poly_GaussCoil
+        self.shape_indep_list.append(Poly_GaussCoil)
+                 
         from sans.models.PorodModel import PorodModel
         self.shape_indep_list.append(PorodModel )
         
-        from sans.models.PeakGaussModel import PeakGaussModel
-        self.shape_indep_list.append(PeakGaussModel)
-        
-        from sans.models.PeakLorentzModel import PeakLorentzModel
-        self.shape_indep_list.append(PeakLorentzModel)
-        
-        from sans.models.FractalAbsModel import FractalAbsModel
-        self.shape_indep_list.append(FractalAbsModel)
-        
-        from sans.models.LorentzModel import LorentzModel
-        self.shape_indep_list.append( LorentzModel) 
-            
-        from sans.models.PowerLawAbsModel import PowerLawAbsModel
-        self.shape_indep_list.append( PowerLawAbsModel )
+        
+        #FractalModel (a c-model)will be used.
+        #from sans.models.FractalAbsModel import FractalAbsModel
+        #self.shape_indep_list.append(FractalAbsModel)
         
         from sans.models.TeubnerStreyModel import TeubnerStreyModel