Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Maddie's ringfinding python modules development branch #83

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

WIP: Maddie's ringfinding python modules development branch #83

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
19d05eb
initial commit of Maddie's ringfinding python modules
Mar 7, 2019
dd2ff3f
added comments describing what the code is doing
maddiebrod Mar 13, 2019
624703c
added docstrings to functions and modified findrings() to take in a n…
maddiebrod Mar 20, 2019
9fdcc5c
calib4.py and calib5.py have the Slyce class and functions outside of…
maddiebrod Mar 20, 2019
4d41990
combined calib4.py and calib5.py into one file calib4.py, and made vi…
maddiebrod Mar 21, 2019
3447f37
removed filename from calib4.py and created test function in test_rin…
maddiebrod Mar 22, 2019
b8dc4bf
modified test_ringfinding with decorator so that it tests the findrin…
maddiebrod Apr 9, 2019
d07e4fb
modified test_ringfinding.py by adding two test functions: one that t…
maddiebrod Apr 13, 2019
c24d4eb
modified findrings in calib4.py so that is raises a RuntimeError if i…
maddiebrod Apr 16, 2019
684e1df
cleaning
CJ-Wright May 3, 2019
90a0f2c
added extra test files in test_ringfinding.py
maddiebrod May 3, 2019
acd0cba
resolved merge conflicts
maddiebrod May 3, 2019
8c59645
replaced Slyce class with dictionaries, made sure r and c are always …
maddiebrod May 7, 2019
ba601c9
moved block of code that plots selected points to a new file vis_cali…
maddiebrod May 7, 2019
a1733cb
modified vis_calib.py file so that it can take in a filename and plot…
maddiebrod May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions xpdtools/calib4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ def findrings(image):
pixel index of point on center ring and pixel indices of points on rings 0,1,2,5

"""

if not isinstance(image,np.ndarray):
raise RuntimeError('input type must be ndarray')

center_pt=findringcenter(image)

#create horizontal slyces from the center of the inner ring (but use 5 and find the median value to avoid issues with hot pixels)
Expand Down
17 changes: 14 additions & 3 deletions xpdtools/tests/test_ringfinding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from xpdtools.calib4 import findrings
import numpy as np

import tifffile as tf

Expand All @@ -11,19 +12,29 @@

DATA_DIR=rs_fn("xpdtools", "data/")

filename=["Ni_onTape_forSlimes_andWahsers_20180812-234250_fe70b9_0001.tiff", 'Ni_calib_20180811-191034_63e554_0001.tiff', 'Ni_pin_20181101-075909_973de2_0001.tiff', 'Ni_calib_20180920-230956_0eedc4_0001.tiff','Ni_calib_20180923-133223_c2a848_0001.tiff']
filename=["Ni_onTape_forSlimes_andWahsers_20180812-234250_fe70b9_0001.tiff", 'Ni_calib_20180811-191034_63e554_0001.tiff', 'Ni_pin_20181101-075909_973de2_0001.tiff', 'Ni_calib_20180920-230956_0eedc4_0001.tiff','Ni_calib_20180923-133223_c2a848_0001.tiff', 'Ni_20180922-001850_2a1c3b_0001.tiff']


@pytest.mark.parametrize("filename,poni", [(filename[0], os.path.splitext(filename[0])[0]+'.edf'),
(filename[1], os.path.splitext(filename[1])[0]+'.edf'),
(filename[2], os.path.splitext(filename[2])[0]+'.edf'),
(filename[3], os.path.splitext(filename[3])[0]+'.edf'),
(filename[4], os.path.splitext(filename[4])[0]+'.edf') ])
(filename[4], os.path.splitext(filename[4])[0]+'.edf'),(filename[5], os.path.splitext(filename[5])[0]+'.edf') ])
def test_ringfinding(filename, poni):
impath=os.path.join(DATA_DIR, filename)
imarray = tf.imread(impath)
pointsimage, center_pt=findrings(imarray)
d=pyFAI.load(poni)
centerx=d.getFit2D()['centerX']
centery=d.getFit2D()['centerY']
assert abs(center_pt[1]-centerx)<=10 and abs(center_pt[0]-centery)<=10
assert abs(center_pt[1]-centerx)<=8 and abs(center_pt[0]-centery)<=8

def test_2Darray():
with pytest.raises(IndexError):
findrings(np.random.rand(2048))

@pytest.mark.parametrize("wrong_input",[[1,2,3],3,2.7,(2,3),'banana'])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

def test_inputtype(wrong_input):
with pytest.raises(RuntimeError):
findrings(wrong_input)