From e37549d270ae4d491500bbc3ba163b04019da4ef Mon Sep 17 00:00:00 2001 From: James Hester Date: Wed, 17 Sep 2025 10:44:39 +1000 Subject: [PATCH 1/5] Add imgCIF to test dictionaries --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ce38e6..d822903 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,6 +104,12 @@ jobs: repository: COMCIFS/MultiBlock_Dictionary path: cif-dictionaries/MultiBlock_Dictionary + - name: Checkout DDLm imgCIF dictionary + uses: actions/checkout@v4 + with: + repository: COMCIFS/imgCIF + path: cif-dictionaries/imgCIF + - name: check_ddlm uses: COMCIFS/dictionary_check_action@main id: ddlm_check From cfe34c825910b9e2faa5839181833db101bf6afe Mon Sep 17 00:00:00 2001 From: James Hester Date: Wed, 17 Sep 2025 11:01:39 +1000 Subject: [PATCH 2/5] Fix imgCIF head category name --- cif_pow.dic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cif_pow.dic b/cif_pow.dic index 903e575..9909828 100644 --- a/cif_pow.dic +++ b/cif_pow.dic @@ -44,7 +44,7 @@ save_PD_GROUP _import.get [ { - 'dupl':Ignore 'file':cif_img.dic 'mode':Full 'save':HEAD + 'dupl':Ignore 'file':cif_img.dic 'mode':Full 'save':CIF_IMG_HEAD } { 'dupl':Ignore 'file':multi_block_core.dic 'mode':Full From 7e43d30029297e065df617829b3a6ee9c445c384 Mon Sep 17 00:00:00 2001 From: James Hester Date: Wed, 17 Sep 2025 11:23:00 +1000 Subject: [PATCH 3/5] Fix errors related to imgCIF import --- cif_pow.dic | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cif_pow.dic b/cif_pow.dic index 9909828..03134d8 100644 --- a/cif_pow.dic +++ b/cif_pow.dic @@ -14,7 +14,7 @@ data_CIF_POW _dictionary.title CIF_POW _dictionary.class Instance _dictionary.version 2.5.0 - _dictionary.date 2025-08-04 + _dictionary.date 2025-09-17 _dictionary.uri https://raw.githubusercontent.com/COMCIFS/Powder_Dictionary/master/cif_pow.dic _dictionary.ddl_conformance 4.2.0 @@ -32,7 +32,7 @@ save_PD_GROUP _definition.id PD_GROUP _definition.scope Category _definition.class Head - _definition.update 2024-12-13 + _definition.update 2025-09-17 _description.text ; Groups all of the categories of definitions in the powder @@ -6908,7 +6908,7 @@ save_pd_diffractogram.scan_id _type.purpose Link _type.source Assigned _type.container Single - _type.contents Text + _type.contents Word save_ @@ -8730,7 +8730,7 @@ save_pd_instr_detector.diffrn_detector_id _type.purpose Link _type.source Related _type.container Single - _type.contents Text + _type.contents Word save_ @@ -14683,4 +14683,7 @@ save_ and _pd_pref_orient_spherical_harmonics.geom to _pd_pref_orient.geom. Added _structure.phase_id. + + Fixed imgCIF import head category name. Corrected types of + links to _diffrn_scan.id and _diffrn_detector.id. ; From 751a73102abbfdfb37c176d0e081943751bed866 Mon Sep 17 00:00:00 2001 From: James Hester Date: Wed, 17 Sep 2025 11:34:53 +1000 Subject: [PATCH 4/5] Fix dates --- cif_pow.dic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cif_pow.dic b/cif_pow.dic index 03134d8..597b4f9 100644 --- a/cif_pow.dic +++ b/cif_pow.dic @@ -14441,7 +14441,7 @@ save_ Deprecated _pd_refln.wavelength_id after consultation with PDDMG. ; - 2.5.0 2025-08-04 + 2.5.0 2025-09-17 ; ## Retain above version number and increment date until final ## release From 3d48877e007bea2aa78efe2a83bb9152b5316540 Mon Sep 17 00:00:00 2001 From: Antanas Vaitkus Date: Tue, 23 Sep 2025 12:53:16 +0300 Subject: [PATCH 5/5] Change dictionary update date --- cif_pow.dic | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cif_pow.dic b/cif_pow.dic index 597b4f9..83df79f 100644 --- a/cif_pow.dic +++ b/cif_pow.dic @@ -14,7 +14,7 @@ data_CIF_POW _dictionary.title CIF_POW _dictionary.class Instance _dictionary.version 2.5.0 - _dictionary.date 2025-09-17 + _dictionary.date 2025-09-23 _dictionary.uri https://raw.githubusercontent.com/COMCIFS/Powder_Dictionary/master/cif_pow.dic _dictionary.ddl_conformance 4.2.0 @@ -32,7 +32,7 @@ save_PD_GROUP _definition.id PD_GROUP _definition.scope Category _definition.class Head - _definition.update 2025-09-17 + _definition.update 2025-09-23 _description.text ; Groups all of the categories of definitions in the powder @@ -14441,7 +14441,7 @@ save_ Deprecated _pd_refln.wavelength_id after consultation with PDDMG. ; - 2.5.0 2025-09-17 + 2.5.0 2025-09-23 ; ## Retain above version number and increment date until final ## release