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

Jump to bottom

When file indices are provided, only read models for the specified im… #210

Merged
merged 11 commits into from
Nov 18, 2020
Merged

When file indices are provided, only read models for the specified im… #210

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
60ceb84
When file indices are provided, only read models for the specified im…
dwpaley Aug 13, 2020
e442c35
short-circuit test 'i in single_file_indices' if it is superfluous
dwpaley Aug 18, 2020
fd9ee14
test single_file_indices by counting calls to format._beam
dwpaley Aug 31, 2020
2316e75
py2 compatibility
dwpaley Aug 31, 2020
d0e578a
refactor loop to avoid testing 'i in single_file_indices'
dwpaley Oct 1, 2020
dc476ce
some cleanup items from @Anthchirp
dwpaley Oct 1, 2020
038b44a
Edits requested by @rjgildea
dwpaley Oct 2, 2020
d095865
Raise error if single_file_indices is an empty list
dwpaley Oct 2, 2020
2da42f9
parametrize test_single_file_indices
dwpaley Oct 2, 2020
99c0a35
Merge branch 'master' into multiimage_use_indices
dwpaley Oct 13, 2020
4b4c162
add newsfragment
dwpaley Nov 18, 2020
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
21 changes: 16 additions & 5 deletions format/FormatMultiImage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,22 @@ def get_imageset(
detector = []
goniometer = []
scan = []
for i in range(format_instance.get_num_images()):
beam.append(format_instance.get_beam(i))
detector.append(format_instance.get_detector(i))
goniometer.append(format_instance.get_goniometer(i))
scan.append(format_instance.get_scan(i))
num_images = format_instance.get_num_images()
for i in range(num_images):
if (
single_file_indices is None
or len(single_file_indices) == num_images
or i in single_file_indices
):
beam.append(format_instance.get_beam(i))
detector.append(format_instance.get_detector(i))
goniometer.append(format_instance.get_goniometer(i))
scan.append(format_instance.get_scan(i))
else:
beam.append(None)
detector.append(None)
goniometer.append(None)
scan.append(None)

if single_file_indices is None:
single_file_indices = list(range(format_instance.get_num_images()))
Expand Down