Changeset 3db3895 in sasview for sansmodels/src/sans/models/DABModel.py

Timestamp:

Mar 25, 2008 11:05:04 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

f629e346

Parents:

829eee9

Message:

Fixed new models - still need validation

File:

• sansmodels/src/sans/models/DABModel.py (modified) (4 diffs)

sansmodels/src/sans/models/DABModel.py

@@ -1 +1 @@
 #!/usr/bin/env python
 """ 
-    Provide F(x) = scale/( 1 + (x*L)^2 )^(2)
+    Provide F(x) = scale/( 1 + (x*L)^2 )^(2) + background
     DAB (Debye Anderson Brumberger) function as a BaseComponent model
 """
@@ -13 +13 @@
         Class that evaluates a DAB model.
         
-        F(x) = scale/( 1 + (x*L)^2 )^(2) +bkd
+        F(x) = scale/( 1 + (x*L)^2 )^(2) + background
         
         The model has three parameters: 
-            L     =  Correlation Length
-            scale  =  scale factor
-            bkd    =  incoherent background
+            L             =  Correlation Length
+            scale         =  scale factor
+            background    =  incoherent background
     """
         
@@ -28 +28 @@
         
         ## Name of the model
-        self.name = " DAB_Model "
+        self.name = "DAB_Model"
 
         ## Define parameters
         self.params = {}
-        self.params['L']     = 40.0
-        self.params['scale'] = 10.0
-        self.params['bkd']   = 0.0
+        self.params['length']             = 50.0
+        self.params['scale']              = 1.0
+        self.params['background']         = 0.0
 
         ## Parameter details [units, min, max]
         self.details = {}
-        self.details['L']    = ['A', None, None]
-        self.details['scale'] = ['', None, None]
-        self.details['bkd']   = ['cm^{-1}', None, None]
+        self.details['length']            = ['', None, None]
+        self.details['scale']             = ['', None, None]
+        self.details['background']        = ['', None, None]
                
     def _DAB(self, x):
         """
-            Evaluate  F(x) = scale/( 1 + (x*L)^2 )^(2) + bkd
+            Evaluate  F(x) = scale/( 1 + (x*L)^2 )^(2) + background
            
         """
-        return self.params['scale']/math.pow(( 1 + math.pow(x * self.params['L'],2)),2) \
-         + self.params['bkd']
+        return self.params['scale']/math.pow(( 1 + math.pow(x * self.params['length'],2)),2) \
+         + self.params['background']
        
    
     def run(self, x = 0.0):
         """ Evaluate the model
-            @param x: simple value
+            @param x: input q-value (float or [float, float] as [r, theta])
             @return: (DAB value)
         """
@@ -65 +65 @@
     def runXY(self, x = 0.0):
         """ Evaluate the model
-            @param x: simple value
+            @param x: input q-value (float or [float, float] as [qx, qy])
             @return: DAB value
         """