switch IMGCIF and MULTI_BLOCK import order#278
Merged
jamesrhester merged 4 commits intoCOMCIFS:masterfrom May 2, 2026
Merged
Conversation
see (3) in COMCIFS/cif_multiblock#42 (comment) and COMCIFS/cif_multiblock#43 (comment) Order change ensures that MULTIBLOCK is defined before CIFIMG, making sure that CIFIMG doesn't override anything in MULTI
Updated type contents of _pd_instr_detector.diffrn_detector_id
to match linked _diffrn_detector.id data item.
Collaborator
|
@rowlesmr, @jamesrhester Is there any specific reason why Is no, then the content type in the multiblock dictionary is at fault here and the |
Collaborator
Author
|
wait out. All of my local copies were stale compared to github |
Contributor
|
It should be |
Collaborator
Author
|
so mmCIF/PDBx type case-sensitive no whitespace == I can do PRs |
jamesrhester
approved these changes
May 2, 2026
This file contains hidden or 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
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.
see (3) in COMCIFS/cif_multiblock#42 (comment) and COMCIFS/cif_multiblock#43 (comment)
Order change ensures that MULTIBLOCK is defined before CIFIMG, making sure that CIFIMG doesn't override anything in MULTI