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

Specifying intensity_choice=auto fails for some dials.export output formats #1926

Merged
merged 3 commits into from
Nov 15, 2021

Conversation

huwjenkins
Copy link
Contributor

Some of the output formats for dials.export fail when intensity_choice=auto is specified on the command line with the cryptic error:

argument of type 'AutoType' is not iterable

This change fixes that.

Copy link
Contributor

@jbeilstenedmands jbeilstenedmands left a comment

Choose a reason for hiding this comment

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

Thanks for finding and fixing, I learnt something new here!

@ndevenish ndevenish enabled auto-merge (squash) November 15, 2021 10:26
@ndevenish
Copy link
Member

The CI tests seem to be an unrelated issue. Merging now to put into release. Thanks for this.

@ndevenish ndevenish merged commit bc98e68 into dials:main Nov 15, 2021
ndevenish pushed a commit that referenced this pull request Nov 16, 2021
)

Fix for format=xds_ascii or format=sadabs when intensity=auto is specified in options to dials.export
DiamondLightSource-build-server added a commit that referenced this pull request Nov 16, 2021
Bugfixes
--------

- ``dials.export``: No longer fails for XDS_ASCII and SADABS export with ``intensity=auto``. (#1926)
DiamondLightSource-build-server added a commit that referenced this pull request Nov 17, 2021
Bugfixes
--------

- ``dials.export``: No longer fails for XDS_ASCII and SADABS export with ``intensity=auto``. (#1926)
@huwjenkins huwjenkins deleted the export-auto-fix branch November 17, 2021 08:29
DiamondLightSource-build-server added a commit that referenced this pull request Nov 17, 2021
Bugfixes
--------

- ``dials.export``: No longer allow (erroneous) MTZ export for multiple experiments with multiple space groups. (#1915)
- ``dials.export``: No longer fails for XDS_ASCII and SADABS export with ``intensity=auto``. (#1926)
- ``dials.report``: Fix broken json output option. Include more graphs in json output. (#1932)
dagewa pushed a commit to dagewa/dials that referenced this pull request Dec 13, 2021
…als#1926)

Fix for format=xds_ascii or format=sadabs when intensity=auto is specified in options to dials.export
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

3 participants