Skip to content

switch IMGCIF and MULTI_BLOCK import order #278

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.

Sign up for GitHub

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

Merged
jamesrhester merged 4 commits into from
May 2, 2026
Merged

switch IMGCIF and MULTI_BLOCK import order #278

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89727b6
switch IMGCIF and MULTI_BLOCK import order
rowlesmr May 2, 2026
09cde3f
Updated type contents of _pd_instr_detector.diffrn_detector_id
rowlesmr May 2, 2026
68ab44c
_type.contents is back to Word
rowlesmr May 2, 2026
f674712
revert dates and update text
rowlesmr May 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions cif_pow.dic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ data_CIF_POW
_dictionary.title CIF_POW
_dictionary.class Instance
_dictionary.version 2.5.0
_dictionary.date 2026-04-30
_dictionary.date 2026-05-02
_dictionary.uri
https://raw.githubusercontent.com/COMCIFS/Powder_Dictionary/master/cif_pow.dic
_dictionary.ddl_conformance 4.2.0
Expand All @@ -34,7 +34,7 @@ save_PD_GROUP
_definition.id PD_GROUP
_definition.scope Category
_definition.class Head
_definition.update 2025-09-23
_definition.update 2026-05-02
_description.text
;
Groups all of the categories of definitions in the powder
Expand All @@ -45,13 +45,13 @@ save_PD_GROUP

_import.get
[
{
'dupl':Ignore 'file':cif_img.dic 'mode':Full 'save':CIF_IMG_HEAD
}
{
'dupl':Ignore 'file':multi_block_core.dic 'mode':Full
'save':MULTIBLOCK_CORE
}
{
'dupl':Ignore 'file':cif_img.dic 'mode':Full 'save':CIF_IMG_HEAD
}
]

save_
Expand Down Expand Up @@ -14443,7 +14443,7 @@ save_

Deprecated _pd_refln.wavelength_id after consultation with PDDMG.
;
2.5.0 2026-04-30
2.5.0 2026-05-02
;
## Retain above version number and increment date until final
## release
Expand Down Expand Up @@ -14693,4 +14693,9 @@ save_

Changed the _name.object_id attribute of _pd_instr.beam_size_ax and
_pd_instr.beam_size_eq.

Changed import order of MULTIBLOCK_CORE and CIF_IMG_HEAD such that
MULTIBLOCK_CORE is first. This changes the order in which categories
are defined so that CIF_IMG_HEAD cannot block definitions in
MULTIBLOCK_CORE.
;