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.

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 1030: keep goniometers and scans around if provided in input #1076

Merged
merged 4 commits into from
Feb 5, 2020

Conversation

graeme-winter
Copy link
Contributor

Includes:

  • do not delete things which are provided as input
  • test change to switch back outlier rejection to sauter_poon
    N.B. to get original treatment can import images as stills which deletes goniometer and scan from the get go.

These are cherry-picked from #1075

Even for stills - fixes #1030

Test case:

```dials.index imported.expt strong.refl \
    max_lattices=3 unit_cell=47,71,102,90,90,90 \
    space_group=P222 \
    stills.indexer=sequences joint_indexing=0 \
    indexing.method=fft1d detector.fix=all beam.fix=all \
    outlier.algorithm=tukey```

this made _no_ difference to the text output but kept the goniometer, scan and
image sequence correctly in the output.
Side effect of a53f7b1 was to switch the
default outlier rejection to tukey, but the test is based on results of
using sauter_poon so set this explicitly.
@phyy-nx
Copy link
Member

phyy-nx commented Dec 16, 2019

Hi, don't merge this yet, if that's ok. I need to think about it.

@graeme-winter
Copy link
Contributor Author

graeme-winter commented Dec 16, 2019 via email

@phyy-nx
Copy link
Member

phyy-nx commented Dec 17, 2019

I've had my think. Ok to merge. I can't think of a use case that is broken from my previous post:
#1030 (comment)

I still would like to see a grid scan and its associated headers so I could look a the resultant imported .json file.

@graeme-winter
Copy link
Contributor Author

Thanks @phyy-nx yes we should add some "proper" grid data to the test set for this, probably via zenodo.

@graeme-winter graeme-winter merged commit d4251a1 into master Feb 5, 2020
@Anthchirp Anthchirp deleted the fix-1030 branch May 1, 2020 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants