Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ jobs:
- name: Check out the multiblock coreCIF dictionary
uses: actions/checkout@v6
with:
repository: COMCIFS/cif_multiblock
path: cif-dictionaries/cif_multiblock
repository: COMCIFS/cif_core_multiblock
path: cif-dictionaries/cif_core_multiblock

- name: Run dictionary validity checks
uses: COMCIFS/dictionary_check_action@main
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ when reading and writing data names (the data names themselves are
identical). The following caveats to this ideal situation currently apply:

1. The DDLm imgCIF dictionary inherits `DIFFRN`-linked
categories from the [multi-block dictionary](https://github.com/COMCIFS/cif_multiblock)
categories from the [multiblock coreCIF dictionary](https://github.com/COMCIFS/cif_core_multiblock)
rather than [PDBx/mmCIF](https://mmcif.wwpdb.org). That is,
unlike mmCIF, `DIFFRN_DETECTOR`, `DIFFRN_RADIATION` and `DIFFRN_MEASUREMENT` do
*not* include a data name linked to `_diffrn.id` as a key data name. An issue
Expand Down Expand Up @@ -49,13 +49,13 @@ The DDLm version was automatically obtained from the DDL2 version by running the
commands:

```
julia ddl_to_ddl.jl -c multi_block_core.dic -i --short --strict -t CIF_IMG -o cif_img.dic cbf_imgcif_dictionary/ddl2/cif_img.dic ddl2
julia ddl_to_ddl.jl -c cif_core_multiblock.dic -i --short --strict -t CIF_IMG -o cif_img.dic cbf_imgcif_dictionary/ddl2/cif_img.dic ddl2
```

using the `ddl_to_ddl.jl` and `remove_category.jl` tools and associated DDL
translation dictionaries from the `https://github.com/jamesrhester/ddl_to_ddl`
repository and the `multi_block_core.dic` found in the [COMCIFS Multi-Block
dictionary repository](https://github.com/COMCIFS/cif_multiblock). A [COMCIFS
repository and the `cif_core_multiblock.dic` found in the [COMCIFS Multiblock coreCIF
dictionary repository](https://github.com/COMCIFS/cif_core_multiblock). A [COMCIFS
fork of the DDL2 imgCIF
dictionary](https://github.com/COMCIFS/cbf_imgcif_dictionary) was used as the
DDL2 dictionary source. Currently this fork contains some corrections for
Expand All @@ -70,12 +70,12 @@ translated DDLm dictionary to preserve information not captured by DDLm
attributes. For details see the `ddl_to_ddl` tool. The additional attributes
are later dropped (see below).

2. Any common categories defined to be of class `Set` in `multi_block_core.dic` are
2. Any common categories defined to be of class `Set` in `cif_core_multiblock.dic` are
restated to be `Set` categories in the translated dictionary

3. The dictionary title is changed to `cif_img` to conform to DDLm style.

4. (`--short`): The import of `multi_block_core.dic` in the emitted DDLm
4. (`--short`): The import of `cif_core_multiblock.dic` in the emitted DDLm
dictionary will not specify a directory for simplicity in testing. This implies
that all dictionaries are in the same directory.

Expand Down
10 changes: 5 additions & 5 deletions cif_img.dic
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ data_CIF_IMG
_dictionary.title CIF_IMG
_dictionary.class Instance
_dictionary.version 1.8.9
_dictionary.date 2026-05-14
_dictionary.date 2026-06-18
_dictionary.uri https://github.com/COMCIFS/imgCIF/cif_img.dic
_dictionary.ddl_conformance 4.2.0
_dictionary.namespace CifCore
Expand Down Expand Up @@ -699,7 +699,7 @@ save_CIF_IMG_HEAD
_definition.id CIF_IMG_HEAD
_definition.scope Category
_definition.class Head
_definition.update 2026-05-14
_definition.update 2026-06-18
_description.text
;
The HEAD category is the parent category of all definitions in the
Expand All @@ -709,8 +709,8 @@ save_CIF_IMG_HEAD
_name.object_id CIF_IMG_HEAD

_import.get
[{'dupl':Ignore 'file':multi_block_core.dic 'mode':Full
'save':multiblock_core}]
[{'dupl':Ignore 'file':cif_core_multiblock.dic 'mode':Full
'save':CIF_CORE_MULTIBLOCK_HEAD}]

save_

Expand Down Expand Up @@ -11432,7 +11432,7 @@ save_
;
Pick up minor type corrections from 1.8.9 dcitionary
;
1.8.9 2026-05-14
1.8.9 2026-06-18
;
Addition of missing diffrn.id pointers

Expand Down
2 changes: 1 addition & 1 deletion cif_img_variant.dic
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data_VARIANT_DIC
_dictionary.title VARIANT_DIC
_dictionary.class Instance
_dictionary.version 1.0.0
_dictionary.date 2026-05-14
_dictionary.date 2026-06-18
_dictionary.ddl_conformance 4.2.0
_dictionary.namespace CifCore
_description.text
Expand Down
8 changes: 4 additions & 4 deletions expanded/cif_img_expanded.dic
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ data_CIF_IMG.DIC
_dictionary.title cif_img.dic
_dictionary.class Instance
_dictionary.version 1.8.9
_dictionary.date 2026-05-14
_dictionary.date 2026-06-18
_dictionary.ddl_conformance 4.2.0
_dictionary.namespace CifCore
_description.text
Expand Down Expand Up @@ -774,8 +774,8 @@ save_HEAD
_name.object_id HEAD

_import.get
[{'dupl':Ignore 'file':multi_block_core.dic 'mode':Full
'save':multiblock_core}]
[{'dupl':Ignore 'file':cif_core_multiblock.dic 'mode':Full
'save':CIF_CORE_MULTIBLOCK_HEAD}]

save_

Expand Down Expand Up @@ -14103,7 +14103,7 @@ save_
_dictionary_audit.version
_dictionary_audit.date
_dictionary_audit.revision
1.8.9 2026-05-14
1.8.9 2026-06-18
;
Addition of missing diffrn.id pointers

Expand Down