Skip to content

Commit 563bf99

Browse files
authored
_pd_diffractogram links to imgCIF (COMCIFS#234)
* scan id data name to pd_diffractogram
1 parent 9aae155 commit 563bf99

File tree

2 files changed

+35
-9
lines changed

2 files changed

+35
-9
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
branches: [ master ]
1515
paths-ignore:
1616
- '.github/**'
17-
workflow_dispatch:
17+
workflow_dispatch:
1818

1919
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2020
jobs:
@@ -27,7 +27,7 @@ jobs:
2727
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2828
- name: checkout
2929
uses: actions/checkout@v4
30-
30+
3131
# Check syntax of all CIF files
3232
- name: check_syntax
3333
uses: COMCIFS/cif_syntax_check_action@master
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
path: ~/.julia
4545
key: ${{ runner.os }}-julia-v2
46-
46+
4747
- name: Install Julia
4848
uses: julia-actions/setup-julia@v1
4949
with:
@@ -77,13 +77,13 @@ jobs:
7777
run: |
7878
julia -e 'using Pkg; Pkg.status()'
7979
for file in main/*.dic
80-
do
80+
do
8181
echo "Checking $file"
8282
julia -O0 ./julia_cif_tools/linter.jl -i $PWD/cif_core $file cif_core/ddl.dic
83-
if [ $? != 0 ]
84-
then
83+
if [ $? != 0 ]
84+
then
8585
exit 1 ;
86-
fi
86+
fi
8787
done
8888
ddlm:
8989
runs-on: ubuntu-latest

cif_pow.dic

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ save_PD_GROUP
4343

4444
_import.get
4545
[
46+
{
47+
'dupl':Ignore 'file':cif_img.dic 'mode':Full 'save':HEAD
48+
}
4649
{
4750
'dupl':Ignore 'file':multi_block_core.dic 'mode':Full
4851
'save':MULTIBLOCK_CORE
@@ -6805,6 +6808,26 @@ save_pd_diffractogram.instr_id
68056808

68066809
save_
68076810

6811+
save_pd_diffractogram.scan_id
6812+
6813+
_definition.id '_pd_diffractogram.scan_id'
6814+
_definition.update 2025-07-01
6815+
_description.text
6816+
;
6817+
The identifier for the group of imgCIF images used to produce the
6818+
diffractogram. Each group of images is known as a scan, and the images
6819+
belonging to each scan are described using imgCIF data names.
6820+
;
6821+
_name.category_id pd_diffractogram
6822+
_name.object_id scan_id
6823+
_name.linked_item_id '_diffrn_scan.id'
6824+
_type.purpose Link
6825+
_type.source Assigned
6826+
_type.container Single
6827+
_type.contents Text
6828+
6829+
save_
6830+
68086831
save_pd_diffractogram.spec_id
68096832

68106833
_definition.id '_pd_diffractogram.spec_id'
@@ -14351,8 +14374,11 @@ save_
1435114374

1435214375
Added _pd_meas_overall.step_count_time.
1435314376

14354-
Removed _pd_calib_detected_intensity.id as data item and category key
14355-
of PD_CALIB_DETECTED_INTENSITY.
14377+
Update PD_DIFFRACTOGRAM to link to the imgCIF scan from which the
14378+
diffractogram was created.
14379+
14380+
Removed _pd_calib_detected_intensity.id as data item and category
14381+
key of PD_CALIB_DETECTED_INTENSITY.
1435614382

1435714383
Update PD_INSTR and PD_INSTR_DETECTOR descriptions.
1435814384

0 commit comments

Comments
 (0)