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

Timestamp:

Jan 18, 2011 8: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/TwoPowerLawModel.py (modified) (2 diffs)

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']