Changeset 18695bf in sasview for sansmodels/src/sans/models/UnifiedPowerRgModel.py

Timestamp:

Jan 18, 2011 10:38:36 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:

18b89c4

Parents:

1b02da1d

Message:

replaced math.pow to numpy.power since math.pow is not working with list of x values(remember we use the list in fitting for speed)

File:

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

sansmodels/src/sans/models/UnifiedPowerRgModel.py

@@ -1 +1 @@
    
 from sans.models.BaseComponent import BaseComponent
-from math import pow,exp, sqrt
+from math import exp, sqrt
+from numpy import power
 from scipy.special import erf
 max_level_n = 7
@@ -74 +75 @@
         for ind in range(1,l_num+1):
             # get exp term
-            exp_now = exp(-pow(x*self.params['Rg%s'% ind],2)/3.0)
+            exp_now = exp(-power(x*self.params['Rg%s'% ind],2)/3.0)
             # get erf term
             erf_now = erf(x*self.params['Rg%s'% ind]/sqrt(6.0))
             # get power term
-            pow_now = pow((erf_now*erf_now*erf_now/x),self.params['power%s'% ind])
+            pow_now = power((erf_now*erf_now*erf_now/x),self.params['power%s'% ind])
             # get next exp term only if it exists
             try:
-                exp_next = exp(-pow(x*self.params['Rg%s'% (ind+1)],2)/3.0)
+                exp_next = exp(-power(x*self.params['Rg%s'% (ind+1)],2)/3.0)
             except:
                 exp_next = 1.0