Changeset 975ec8e in sasview for sansmodels/src/sans/models/LamellarModel.py

Timestamp:

Aug 14, 2009 3:58:58 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:

d5bd424

Parents:

cad821b

Message:

working on 2D models. Still need smore corrections and unit tests.

File:

• sansmodels/src/sans/models/LamellarModel.py (modified) (2 diffs)

sansmodels/src/sans/models/LamellarModel.py

@@ -33 +33 @@
         List of default parameters:
          scale           = 1.0 
-         delta           = 50.0 [A]
-         sigma           = 0.15 
-         contrast        = 5.3e-006 [1/A²]
+         bi_thick        = 50.0 [A]
+         sld_bi          = 1e-006 [1/A²]
+         sld_sol         = 6.3e-006 [1/A²]
          background      = 0.0 [1/cm]
 
@@ -52 +52 @@
         self.description ="""[Dilute Lamellar Form Factor](from a lyotropic lamellar phase)
                 I(q)= 2*pi*P(q)/(delta *q^(2)), where
-                P(q)=2*(contrast/q)^(2)*(1-cos(q*delta)
-                *e^(1/2*(q*sigma)^(2)).
-                delta = bilayer thickness
-                sigma = variation in bilayer thickness
-                = delta*polydispersity
-                contrast = SLD_solvent - SLD_bilayer
-                Note: the polydispersity in delta is included."""
+                P(q)=2*(contrast/q)^(2)*(1-cos(q*delta))^(2))
+                bi_thick = bilayer thickness
+                sld_bi = SLD of bilayer
+                sld_sol = SLD of solvent
+                background = Incoherent background
+                scale = scale factor
+                """
        
                 ## Parameter details [units, min, max]
         self.details = {}
         self.details['scale'] = ['', None, None]
-        self.details['delta'] = ['[A]', None, None]
-        self.details['sigma'] = ['', None, None]
-        self.details['contrast'] = ['[1/A²]', None, None]
+        self.details['bi_thick'] = ['[A]', None, None]
+        self.details['sld_bi'] = ['[1/A²]', None, None]
+        self.details['sld_sol'] = ['[1/A²]', None, None]
         self.details['background'] = ['[1/cm]', None, None]