Changeset 442895f in sasview for sansview/perspectives/fitting/models.py

Timestamp:

Sep 23, 2008 3:25:52 PM (16 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:

6aa47df

Parents:

e71440c

Message:

models added

File:

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

sansview/perspectives/fitting/models.py

@@ -1 +1 @@
 import wx
 import imp
-import os,sys
+import os,sys,math
 import os.path
 
@@ -76 +76 @@
         self.model_list = {}
         self.model_list_box = {}
+        
         model_info="shape-based models"
+        
+        from sans.models.SphereModel import SphereModel
+        self.model_list[str(wx.NewId())] =  ModelInfo(SphereModel , model_info)
+        
         from sans.models.CylinderModel import CylinderModel
         self.model_list[str(wx.NewId())] = ModelInfo(CylinderModel , model_info)
       
-        from sans.models.SphereModel import SphereModel
-        self.model_list[str(wx.NewId())] =  ModelInfo(SphereModel , model_info)
-   
+        from sans.models.CoreShellModel import CoreShellModel
+        self.model_list[str(wx.NewId())] = ModelInfo(CoreShellModel , model_info)
+        
+        from sans.models.CoreShellCylinderModel import CoreShellCylinderModel
+        self.model_list[str(wx.NewId())] = ModelInfo(CoreShellCylinderModel , model_info)
+        
+        from sans.models.EllipticalCylinderModel import EllipticalCylinderModel
+        self.model_list[str(wx.NewId())] = ModelInfo(EllipticalCylinderModel , model_info)
+        
+        from sans.models.EllipsoidModel import EllipsoidModel
+        self.model_list[str(wx.NewId())] = ModelInfo(EllipsoidModel , model_info)
+        
         from sans.guitools.LineModel import LineModel
         self.model_list[str(wx.NewId())]  = ModelInfo(LineModel , model_info)
+        
+        
         model_info="shape-independent models"
-        from sans.models.Lorentzian import Lorentzian
-        self.indep_model.append( ModelInfo(Lorentzian , model_info) )
+        
+        from sans.models.BEPolyelectrolyte import BEPolyelectrolyte
+        self.indep_model.append( ModelInfo( BEPolyelectrolyte , model_info) )
+        
+        from sans.models.DABModel import DABModel
+        self.indep_model.append( ModelInfo(DABModel , model_info+
+        "\n Evaluates F(x) = scale/( 1 + (x*L)^2 )^(2) +bkd") )
+        
+        from sans.models.DebyeModel import DebyeModel
+        self.indep_model.append( ModelInfo(DebyeModel , model_info+
+        "\n Evaluates F(x) = 2( exp(-x)+x -1 )/x**2") )
+        
+        from sans.models.FractalModel import FractalModel
+        class FractalAbsModel(FractalModel):
+            def _Fractal(self, x):
+                return FractalModel._Fractal(self, math.fabs(x))
+        self.indep_model.append( ModelInfo(FractalAbsModel , model_info) )
+        
+        from sans.models.LorentzModel import LorentzModel
+        self.indep_model.append( ModelInfo(LorentzModel , model_info+
+                "\n Evaluates F(x)= scale/( 1 + (x*L)^2 ) + bkd ") ) 
+            
+        from sans.models.PowerLawModel import PowerLawModel
+        class PowerLawAbsModel(PowerLawModel):
+            def _PowerLaw(self, x):
+                try:
+                    return PowerLawModel._PowerLaw(self, math.fabs(x))
+                except:
+                    print sys.exc_value  
+        self.indep_model.append( ModelInfo(PowerLawAbsModel , model_info+
+        "\n Evaluates abs(F(x)) \n with F(x) = scale* (x)^(m) + bkd ") )
+                    
+       
+        from sans.models.TeubnerStreyModel import TeubnerStreyModel
+        self.indep_model.append( ModelInfo(TeubnerStreyModel , model_info) )
+        
+        
+          
+        
+        
+      
         
         #Looking for plugins