Skip to content

Read study_id as the study identifier and expose the number as study_nr #220

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
headmeister merged 2 commits into from
Aug 24, 2026
Merged

Read study_id as the study identifier and expose the number as study_nr #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ac51a5
Read the 2dseq subj_id from VisuSubjectId, not from the subject's name
gdevenyi Aug 22, 2026
ba2bae7
Read study_id as the study identifier and expose the number as study_nr
gdevenyi Aug 22, 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
18 changes: 15 additions & 3 deletions brukerapi/config/properties_2dseq_custom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"subj_id": [
{
"cmd": "#VisuSubjectName",
"cmd": "#VisuSubjectId",
"conditions": [
]
},
Expand All @@ -13,7 +13,19 @@
],
"study_id": [
{
"cmd": "str(#VisuStudyNumber)",
"cmd": "#VisuStudyId",
"conditions": [
]
},
{
"cmd": "''",
"conditions": [
]
}
],
"study_nr": [
{
"cmd": "#VisuStudyNumber",
"conditions": [
]
},
Expand Down Expand Up @@ -49,7 +61,7 @@
],
"id": [
{
"cmd": "'2DSEQ_{}_{}_{}_{}'.format(@exp_id, @proc_id, @subj_id, @study_id)",
"cmd": "'2DSEQ_{}_{}_{}_{}'.format(@exp_id, @proc_id, @subj_id, @study_nr)",
"conditions": [
]
}
Expand Down
18 changes: 16 additions & 2 deletions brukerapi/config/properties_fid_custom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,21 @@
],
"study_id": [
{
"cmd": "str(#SUBJECT_study_nr)",
"cmd": "#SUBJECT_study_name",
"conditions": [

]
},
{
"cmd": "''",
"conditions": [

]
}
],
"study_nr": [
{
"cmd": "#SUBJECT_study_nr",
"conditions": [

]
Expand Down Expand Up @@ -43,7 +57,7 @@
],
"id": [
{
"cmd": "'FID_{}_{}_{}'.format(@exp_id, @subj_id, @study_id)",
"cmd": "'FID_{}_{}_{}'.format(@exp_id, @subj_id, @study_nr)",
"conditions": [
]
}
Expand Down
14 changes: 12 additions & 2 deletions brukerapi/config/properties_fid_proc_custom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,17 @@
],
"study_id": [
{
"cmd": "str(#SUBJECT_study_nr)",
"cmd": "#SUBJECT_study_name",
"conditions": []
},
{
"cmd": "''",
"conditions": []
}
],
"study_nr": [
{
"cmd": "#SUBJECT_study_nr",
"conditions": []
},
{
Expand Down Expand Up @@ -41,7 +51,7 @@
],
"id": [
{
"cmd": "'{}_{}_{}_{}_{}'.format(@type.upper(), @exp_id, @proc_id, @subj_id, @study_id)",
"cmd": "'{}_{}_{}_{}_{}'.format(@type.upper(), @exp_id, @proc_id, @subj_id, @study_nr)",
"conditions": [],
"comment": "spec 3.5: these live in the PROCNO, so the id names the reconstruction as a 2dseq id does"
}
Expand Down
18 changes: 16 additions & 2 deletions brukerapi/config/properties_rawdata_custom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,21 @@
],
"study_id": [
{
"cmd": "str(#SUBJECT_study_nr)",
"cmd": "#SUBJECT_study_name",
"conditions": [

]
},
{
"cmd": "''",
"conditions": [

]
}
],
"study_nr": [
{
"cmd": "#SUBJECT_study_nr",
"conditions": [

]
Expand Down Expand Up @@ -43,7 +57,7 @@
],
"id": [
{
"cmd": "f'RawData_{@subtype}_{@exp_id}_{@subj_id}_{@study_id}'",
"cmd": "f'RawData_{@subtype}_{@exp_id}_{@subj_id}_{@study_nr}'",
"conditions": [
]
}
Expand Down
14 changes: 12 additions & 2 deletions brukerapi/config/properties_traj_custom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,17 @@
],
"study_id": [
{
"cmd": "str(#SUBJECT_study_nr)",
"cmd": "#SUBJECT_study_name",
"conditions": []
},
{
"cmd": "''",
"conditions": []
}
],
"study_nr": [
{
"cmd": "#SUBJECT_study_nr",
"conditions": []
},
{
Expand All @@ -31,7 +41,7 @@
],
"id": [
{
"cmd": "'Traj_{}*{}*{}'.format(@exp_id, @subj_id, @study_id)",
"cmd": "'Traj_{}*{}*{}'.format(@exp_id, @subj_id, @study_nr)",
"conditions": []
}
]
Expand Down
1 change: 1 addition & 0 deletions brukerapi/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,7 @@ def to_dict(self, props=None):
"_schema",
"random_access",
"study_id",
"study_nr",
"exp_id",
"proc_id",
"subj_id",
Expand Down
Loading