wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-13 17:45:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

PEP8 style changes for transform.radon_transform and its tests

Browse Source
This commit is contained in:
Jostein Bø Fløystad
2013-05-27 20:42:59 +02:00
parent 8208293c93
commit c9ae913d32
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/transform/radon_transform.py
+6 -6
View File
@@ -79,10 +79,10 @@ def radon(image, theta=None, circle=False):
widthpad = np.ceil(diagonal - width)
padded_image = np.zeros((int(height + heightpad),
int(width + widthpad)))
y0, y1 = int(np.ceil(heightpad / 2)), \
int((np.ceil(heightpad / 2) + height))
x0, x1 = int((np.ceil(widthpad / 2))), \
int((np.ceil(widthpad / 2) + width))
y0 = int(np.ceil(heightpad / 2))
y1 = int((np.ceil(heightpad / 2) + height))
x0 = int((np.ceil(widthpad / 2)))
x1 = int((np.ceil(widthpad / 2) + width))
padded_image[y0:y1, x0:x1] = image
out = np.zeros((max(padded_image.shape), len(theta)))
@@ -209,7 +209,7 @@ def iradon(radon_image, theta=None, output_size=None,
f[1:] = f[1:] * (0.54 + 0.46 * np.cos(w[1:]))
elif filter == "hann":
f[1:] = f[1:] * (1 + np.cos(w[1:])) / 2
elif filter == None:
elif filter is None:
f[1:] = 1
else:
raise ValueError("Unknown filter: %s" % filter)
@@ -253,7 +253,7 @@ def iradon(radon_image, theta=None, output_size=None,
b0 = ((((b + 1 > 0) & (b + 1 < n)) * (b + 1)) - 1).astype(np.int)
b1 = ((((b > 0) & (b < n)) * b) - 1).astype(np.int)
backprojected = (t - a) * radon_filtered[b0, i] + \
(a - t + 1) * radon_filtered[b1, i]
(a - t + 1) * radon_filtered[b1, i]
if circle:
backprojected[~reconstruction_circle] = 0.
reconstructed += backprojected
skimage/transform/tests/test_radon_transform.py
+2
View File
@@ -105,6 +105,7 @@ def test_reconstruct_with_wrong_angles():
iradon(p, theta=[0, 1, 2])
assert_raises(ValueError, iradon, p, theta=[0, 1, 2, 3])
def test_radon_circle():
a = np.ones((10, 10))
assert_raises(ValueError, radon, a, circle=True)
@@ -131,6 +132,7 @@ def test_radon_circle():
print(relative_error.max(), relative_error.mean())
assert np.all(relative_error < 3e-3)
def test_radon_iradon_circle():
shape = (61, 79)
# Synthetic random data, zero outside reconstruction circle