Only show format if not null #1981
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
i.e. not Format or FormatMultiImage - used to just check was not Format. Avoids confusion in looking at dials.show output. Fixes #1980
Codecov Report
@@ Coverage Diff @@
## main #1981 +/- ##
=======================================
Coverage 67.64% 67.64%
=======================================
Files 629 629
Lines 71400 71400
Branches 10471 10471
=======================================
Hits 48295 48295
Misses 21125 21125
Partials 1980 1980 |
ndevenish
reviewed
Jan 19, 2022
command_line/show.py
Outdated
| @@ -250,7 +250,7 @@ def show_experiments(experiments, show_scan_varying=False): | |||
| for i_expt, expt in enumerate(experiments): | |||
| text.append("Experiment %i:" % i_expt) | |||
| format_class = expt.imageset.get_format_class() | |||
| if format_class.__name__ != "Format": | |||
| if format_class.__name__ not in ["Format", "FormatMultiImage"]: | |||
There was a problem hiding this comment.
Suggested change
| if format_class.__name__ not in ["Format", "FormatMultiImage"]: | |
| if not format_class.abstract(): |
Would this be more robust?
There was a problem hiding this comment.
Possibly, but if not:
Suggested change
| if format_class.__name__ not in ["Format", "FormatMultiImage"]: | |
| if format_class.__name__ not in {"Format", "FormatMultiImage"}: |
There was a problem hiding this comment.
abstract() not always defined 🤔
and it turns out FormatMultiImage is not abstract, either
There was a problem hiding this comment.
Done subsequent suggestion instead.
There was a problem hiding this comment.
oh ffs it's
is_abstract
Probably yeh, will try that later
Co-authored-by: Nicholas Devenish <ndevenish@gmail.com>
This reverts commit 6aea766. Does not work, but the idea was superior
|
This test is now failing because of cctbx/dxtbx#463 |
ndevenish
added a commit
that referenced
this pull request
Jan 24, 2022
If the images are not available or running in CHECK_FORMAT mode, then the concrete type is not available and only one of the abstract root formats will be resolved. In those cases, it's not useful to print out the format type. Co-authored-by: Nicholas Devenish <ndevenish@gmail.com>
DiamondLightSource-build-server
added a commit
that referenced
this pull request
Jan 24, 2022
Bugfixes -------- - Correct reporting of phi angle in scan-varying model plots. (#1929) - ``dials.sequence_to_stills``: correct error in the crystal model for scans that do not start from image 1. (#1933) - `dials.show`: only show format class if meaningful (i.e. not Format or FormatMultiImage) (#1981) Improved Documentation ---------------------- - Update some Cosym and resolution-related PHIL descriptions. (#1969)
Merged
DiamondLightSource-build-server
added a commit
that referenced
this pull request
Jan 25, 2022
Bugfixes -------- - Correct reporting of phi angle in scan-varying model plots. (#1929) - ``dials.sequence_to_stills``: correct error in the crystal model for scans that do not start from image 1. (#1933) - `dials.show`: only show format class if meaningful (i.e. not Format or FormatMultiImage) (#1981) Improved Documentation ---------------------- - Update some Cosym and resolution-related PHIL descriptions. (#1969)
DiamondLightSource-build-server
added a commit
that referenced
this pull request
Jan 25, 2022
Features -------- - It is now possible to explicitly bootstrap all supported python versions. (`#XXX <https://github.com/dials/dials/issues/XXX>`_) Bugfixes -------- - Correct reporting of phi angle in scan-varying model plots. (#1929) - ``dials.sequence_to_stills``: correct error in the crystal model for scans that do not start from image 1. (#1933) - `dials.show`: only show format class if meaningful (i.e. not Format or FormatMultiImage) (#1981) Improved Documentation ---------------------- - Update some Cosym and resolution-related PHIL descriptions. (#1969)
DiamondLightSource-build-server
added a commit
that referenced
this pull request
Jan 25, 2022
Features -------- - It is now possible to explicitly bootstrap all supported python versions. (#1988) Bugfixes -------- - Correct reporting of phi angle in scan-varying model plots. (#1929) - ``dials.sequence_to_stills``: correct error in the crystal model for scans that do not start from image 1. (#1933) - `dials.show`: only show format class if meaningful (i.e. not Format or FormatMultiImage) (#1981) Improved Documentation ---------------------- - Update some Cosym and resolution-related PHIL descriptions. (#1969)
DiamondLightSource-build-server
added a commit
that referenced
this pull request
Jan 25, 2022
Features -------- - It is now possible to explicitly bootstrap all supported python versions. (#1988) Bugfixes -------- - ``dials.refine``: Fix crash from recording of parameter correlations in ``history.json``. (#1923) - Correct reporting of phi angle in scan-varying model plots. (#1929) - ``dials.sequence_to_stills``: correct error in the crystal model for scans that do not start from image 1. (#1933) - `dials.show`: only show format class if meaningful (i.e. not Format or FormatMultiImage) (#1981) Improved Documentation ---------------------- - Update some Cosym and resolution-related PHIL descriptions. (#1969)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
i.e. not Format or FormatMultiImage - used to just check was not Format.
Avoids confusion in looking at dials.show output.
Fixes #1980