Changeset 9a5097c in sasview for src/sas/sascalc/data_util/err1d.py

Timestamp:

Mar 26, 2017 11:33:16 PM (8 years ago)

Author:

andyfaff

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ed2276f

Parents:

9146ed9

Message:

MAINT: import numpy as np

File:

• src/sas/sascalc/data_util/err1d.py (modified) (4 diffs)

src/sas/sascalc/data_util/err1d.py

@@ -8 +8 @@
 """
 from __future__ import division  # Get true division
-import numpy
+import numpy as np
 
 
@@ -59 +59 @@
 def exp(X, varX):
     """Exponentiation with error propagation"""
-    Z = numpy.exp(X)
+    Z = np.exp(X)
     varZ = varX * Z**2
     return Z, varZ
@@ -66 +66 @@
 def log(X, varX):
     """Logarithm with error propagation"""
-    Z = numpy.log(X)
+    Z = np.log(X)
     varZ = varX / X**2
     return Z, varZ
@@ -73 +73 @@
 # def pow(X,varX, Y,varY):
 #    Z = X**Y
-#    varZ = (Y**2 * varX/X**2 + varY * numpy.log(X)**2) * Z**2
+#    varZ = (Y**2 * varX/X**2 + varY * np.log(X)**2) * Z**2
 #    return Z,varZ
 #