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

Fix write_crystfel_geom offset unit #102

Merged
merged 4 commits into from
Sep 22, 2021
Merged

Fix write_crystfel_geom offset unit #102

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8014128
Fix write_crystfel_geom offset unit
JunCEEE Aug 27, 2021
ee6ff29
Have a seperate coffset variable within 'frag_to_crystfel'
JunCEEE Aug 30, 2021
208df30
Don't use extra local variable
takluyver Sep 22, 2021
ca8449f
Test round-tripping .geom file with z dimension (coffset)
takluyver Sep 22, 2021
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
5 changes: 3 additions & 2 deletions extra_geom/crystfel_fmt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ def _crystfel_format_vec(vec):

def frag_to_crystfel(fragment, p, a, ss_slice, fs_slice, dims, pixel_size):
tile_name = 'p{}a{}'.format(p, a)
c = fragment.corner_pos / pixel_size
c = fragment.corner_pos[:2] / pixel_size
coffset = fragment.corner_pos[2]
takluyver marked this conversation as resolved.
Show resolved Hide resolved
dim_list = []
for num, value in dims.items():
if value == 'modno':
Expand All @@ -74,7 +75,7 @@ def frag_to_crystfel(fragment, p, a, ss_slice, fs_slice, dims, pixel_size):
fs_vec=_crystfel_format_vec(fragment.fs_vec/ pixel_size),
corner_x=c[0],
corner_y=c[1],
coffset=c[2],
coffset=coffset,
takluyver marked this conversation as resolved.
Show resolved Hide resolved
)

def write_crystfel_geom(self, filename, *,
Expand Down