Changeset 18695bf in sasview

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)

Location:

sansmodels/src/sans/models

Files:

• BroadPeakModel.py (modified) (3 diffs)
• CorrLengthModel.py (modified) (2 diffs)
• FractalCoreShellModel.py (modified) (2 diffs)
• TwoLorentzianModel.py (modified) (2 diffs)
• TwoPowerLawModel.py (modified) (2 diffs)
• UnifiedPowerRgModel.py (modified) (2 diffs)

sansmodels/src/sans/models/BroadPeakModel.py

@@ -5 +5 @@
 
 from sans.models.BaseComponent import BaseComponent
-from math import pow, fabs
+from math import fabs
+from numpy import power
 
 class BroadPeakModel(BaseComponent):
@@ -19 +20 @@
         # Initialize BaseComponent first, then sphere
         BaseComponent.__init__(self)
-        
+        self.counter = 0
         ## Name of the model
         self.name = "BroadPeak"
@@ -60 +61 @@
         inten = self.params['scale_p']/pow(x,self.params['exponent_p'])
         inten += self.params['scale_l']/(1.0 + \
-                pow((fabs(x-self.params['q_peak'])*self.params['length_l']),self.params['exponent_l']))
+                power((fabs(x-self.params['q_peak'])*self.params['length_l']),\
+                    self.params['exponent_l']))
+
         inten += self.params['background']
-
+        
         return inten  
    

sansmodels/src/sans/models/CorrLengthModel.py

@@ -5 +5 @@
 
 from sans.models.BaseComponent import BaseComponent
-from math import pow
+from numpy import power
 
 class CorrLengthModel(BaseComponent):
@@ -57 +57 @@
         inten = self.params['scale_p']/pow(x,self.params['exponent_p'])
         inten += self.params['scale_l']/(1.0 + \
-                pow((x*self.params['length_l']),self.params['exponent_l']))
+                power((x*self.params['length_l']),self.params['exponent_l']))
         inten += self.params['background']
 

sansmodels/src/sans/models/FractalCoreShellModel.py

@@ -3 +3 @@
 from sans.models.CoreShellModel import CoreShellModel
 from scipy.special import gammaln
-from math import exp, pow, sin, atan
+from math import exp, sin, atan
+from numpy import power
 from copy import deepcopy
 
@@ -79 +80 @@
         #calculate S(q)
         sq = Df*exp(gammaln(Df-1.0))*sin((Df-1.0)*atan(x*corr))
-        sq /= pow((x*r0),Df) * pow((1.0 + 1.0/(x*corr*x*corr)),((Df-1)/2))
+        sq /= power((x*r0),Df) * power((1.0 + 1.0/(x*corr*x*corr)),((Df-1)/2))
         sq += 1.0
         return sq

sansmodels/src/sans/models/TwoLorentzianModel.py

@@ -5 +5 @@
 
 from sans.models.BaseComponent import BaseComponent
-from math import pow
+from numpy import power
 
 class TwoLorentzianModel(BaseComponent):
@@ -59 +59 @@
         """
         inten = self.params['scale_1']/(1.0 + \
-                pow((x*self.params['length_1']),self.params['exponent_1']))
+                power((x*self.params['length_1']),self.params['exponent_1']))
         inten += self.params['scale_2']/(1.0 + \
-                pow((x*self.params['length_2']),self.params['exponent_2']))
+                power((x*self.params['length_2']),self.params['exponent_2']))
         inten += self.params['background']
 

sansmodels/src/sans/models/TwoPowerLawModel.py

@@ -7 +7 @@
 
 from sans.models.BaseComponent import BaseComponent
-from math import pow
+from numpy import power
 
 class TwoPowerLawModel(BaseComponent):
@@ -65 +65 @@
         qc= self.params['qc']
         if(x<=qc):
-            inten = self.params['coef_A']*pow(x,-1.0*self.params['power1'])
+            inten = self.params['coef_A']*power(x,-1.0*self.params['power1'])
         else:
-            scale = self.params['coef_A']*pow(qc,-1.0*self.params['power1']) \
-                                    / pow(qc,-1.0*self.params['power2'])
-            inten = scale*pow(x,-1.0*self.params['power2'])
+            scale = self.params['coef_A']*power(qc,-1.0*self.params['power1']) \
+                                    / power(qc,-1.0*self.params['power2'])
+            inten = scale*power(x,-1.0*self.params['power2'])
         inten += self.params['background']
 

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