Skip to content

switch IMGCIF and MULTI_BLOCK import order#278

Merged
jamesrhester merged 4 commits intoCOMCIFS:masterfrom
rowlesmr:change-import-order
May 2, 2026
Merged

switch IMGCIF and MULTI_BLOCK import order#278
jamesrhester merged 4 commits intoCOMCIFS:masterfrom
rowlesmr:change-import-order

Conversation

@rowlesmr
Copy link
Copy Markdown
Collaborator

@rowlesmr rowlesmr commented May 2, 2026

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

rowlesmr added 2 commits May 2, 2026 20:52
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.
@vaitkus
Copy link
Copy Markdown
Collaborator

vaitkus commented May 2, 2026

@rowlesmr, @jamesrhester Is there any specific reason why _diffrn_detector.id should have the Text content type instead of Code?

Is no, then the content type in the multiblock dictionary is at fault here and the _diffrn_detector.id definition in that dictionary should be changed.

@rowlesmr
Copy link
Copy Markdown
Collaborator Author

rowlesmr commented May 2, 2026

wait out. All of my local copies were stale compared to github

@jamesrhester
Copy link
Copy Markdown
Contributor

jamesrhester commented May 2, 2026

It should be Word as the mmCIF/PDBx type is code, which is case-sensitive no whitespace.

@rowlesmr
Copy link
Copy Markdown
Collaborator Author

rowlesmr commented May 2, 2026

so mmCIF/PDBx type case-sensitive no whitespace == code, which is DDLm

Word
;
         Case-sensitive sequence of CIF2 characters containing no ASCII
         whitespace.

I can do PRs

@jamesrhester jamesrhester merged commit 29a5ba1 into COMCIFS:master May 2, 2026
4 of 6 checks passed
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.

3 participants