Changeset a7107a6 in sasview for sansmodels/src/sans/models

Timestamp:

Sep 26, 2010 9:53:21 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:

65a8b34

Parents:

7381f34

Message:

cleaned-up a little bit

File:

• sansmodels/src/sans/models/SphereExpShellModel.py (modified) (5 diffs)

sansmodels/src/sans/models/SphereExpShellModel.py

@@ -139 +139 @@
         : return: (r, beta) where r is a list of radius of the transition points
                 beta is a list of the corresponding SLD values 
-        : Note: This works only for func_shell# = 2.
         """
         # max_pts for each shells
@@ -157 +156 @@
             r0 = r[len(r)-1]            
             r.append(r0)
-            exec "beta.append(self.params['sld_in_shell%s'% str(n)])"
+            beta.append(self.params['sld_in_shell%s'% str(n)])
             
-            exec "A = self.params['A_shell%s'% str(n)]"
+            A = self.params['A_shell%s'% str(n)]
             if A ==0:
                 # Right side of each shells
-                exec "r0 += self.params['thick_shell%s'% str(n)]"
+                r0 += self.params['thick_shell%s'% str(n)]
                 r.append(r0)
-                exec "beta.append(self.params['sld_in_shell%s'% str(n)])"
+                beta.append(self.params['sld_in_shell%s'% str(n)])
             else:
                 from math import exp
@@ -170 +169 @@
                 for n_sub in range(0,max_pts):
                     # Right side of each sub_shells
-                    exec "rn += self.params['thick_shell%s'% str(n)]/10.0"
+                    rn += self.params['thick_shell%s'% str(n)]/10.0
                     r.append(rn)
-                    exec "slope = (self.params['sld_out_shell%s'% str(n)] \
+                    slope = (self.params['sld_out_shell%s'% str(n)] \
                                         -self.params['sld_in_shell%s'% str(n)]) \
-                                        /(exp(self.params['A_shell%s'% str(n)])-1)"
-                    exec "const = (self.params['sld_in_shell%s'% str(n)]-slope)"
-                    exec "beta_n = slope*exp((self.params['A_shell%s'% str(n)]*(rn-r0) \
-                                        /self.params['thick_shell%s'% str(n)])) + const"
+                                        /(exp(self.params['A_shell%s'% str(n)])-1)
+                    const = (self.params['sld_in_shell%s'% str(n)]-slope)
+                    beta_n = slope*exp((self.params['A_shell%s'% str(n)]*(rn-r0) \
+                                        /self.params['thick_shell%s'% str(n)])) + const
                     beta.append(beta_n)
             
@@ -246 +245 @@
         
         : param x: input q-value (float or [float, float] as [r, theta])
-        : return: (DAB value)
+        : return: (I value)
         """
 
@@ -256 +255 @@
         
         : param x: input q-value (float or [float, float] as [qx, qy])
-        : return: DAB value
+        : return: I value
         """