Changeset 4a96b8b in sasview for sansutil/err1d.py

Timestamp:

Apr 27, 2012 9:37:14 AM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

507c68f

Parents:

7d6351e

Message:

Pep-8-ification

File:

• sansutil/err1d.py (modified) (14 diffs)

sansutil/err1d.py

@@ -1 +1 @@
 # This program is public domain
-
 """
 Error propogation algorithms for simple arithmetic
@@ -8 +7 @@
 integers, so be sure to create them with floating point inputs.
 """
-
-
 from __future__ import division  # Get true division
 import numpy
 
-def div(X,varX, Y,varY):
+
+def div(X, varX, Y, varY):
     """Division with error propagation"""
     # Direct algorithm:
@@ -28 +26 @@
     return Z, varZ
 
-def mul(X,varX, Y,varY):
+
+def mul(X, varX, Y, varY):
     """Multiplication with error propagation"""
     # Direct algorithm:
@@ -43 +42 @@
     return Z, varZ
 
-def sub(X,varX, Y, varY):
+
+def sub(X, varX, Y, varY):
     """Subtraction with error propagation"""
     Z = X - Y
@@ -49 +49 @@
     return Z, varZ
 
-def add(X,varX, Y,varY):
+
+def add(X, varX, Y, varY):
     """Addition with error propagation"""
     Z = X + Y
@@ -55 +56 @@
     return Z, varZ
 
-def exp(X,varX):
+
+def exp(X, varX):
     """Exponentiation with error propagation"""
     Z = numpy.exp(X)
     varZ = varX * Z**2
-    return Z,varZ
+    return Z, varZ
 
-def log(X,varX):
+
+def log(X, varX):
     """Logarithm with error propagation"""
     Z = numpy.log(X)
     varZ = varX / X**2
-    return Z,varZ
+    return Z, varZ
 
 # Confirm this formula before using it
@@ -74 +77 @@
 #
 
-def pow(X,varX,n):
+
+def pow(X, varX, n):
     """X**n with error propagation"""
     # Direct algorithm
@@ -81 +85 @@
     # Indirect algorithm to minimize intermediates
     Z = X**n
-    varZ = varX/X
+    varZ = varX / X
     varZ /= X
     varZ *= Z
@@ -88 +92 @@
     return Z, varZ
 
-def div_inplace(X,varX, Y,varY):
+
+def div_inplace(X, varX, Y, varY):
     """In-place division with error propagation"""
     # Z = X/Y
@@ -98 +103 @@
     del T   # may want to use T[:] = Y for vectors
     T = Y   # reuse T for Y
-    T **=2     # T now has Y**2
+    T ** = 2     # T now has Y**2
     varX /= T  # varX now has varZ
-    return X,varX
+    return X, varX
 
-def mul_inplace(X,varX, Y,varY):
+
+def mul_inplace(X, varX, Y, varY):
     """In-place multiplication with error propagation"""
     # Z = X * Y
@@ -114 +120 @@
     varX += T  # varX now has varZ
     X *= Y     # X now has Z
-    return X,varX
+    return X, varX
 
-def sub_inplace(X,varX, Y, varY):
+
+def sub_inplace(X, varX, Y, varY):
     """In-place subtraction with error propagation"""
     # Z = X - Y
@@ -122 +129 @@
     X -= Y
     varX += varY
-    return X,varX
+    return X, varX
 
-def add_inplace(X,varX, Y,varY):
+
+def add_inplace(X, varX, Y, varY):
     """In-place addition with error propagation"""
     # Z = X + Y
@@ -130 +138 @@
     X += Y
     varX += varY
-    return X,varX
+    return X, varX
 
-def pow_inplace(X,varX,n):
+
+def pow_inplace(X, varX, n):
     """In-place X**n with error propagation"""
     # Direct algorithm
@@ -141 +150 @@
     varX /= X     # varX now has varX/X**2
     X **= n       # X now has Z = X**n
-    varX *= X     
+    varX *= X
     varX *= X     # varX now has varX/X**2 * Z**2
     varX *= n**2  # varX now has varZ
-    return X,varX
+    return X, varX