@@ -169,7 +169,7 @@ def test_parse_series_spec():
169169
170170 assert pdpn ("bids_func-bold" ) == \
171171 pdpn ("func-bold" ) == \
172- {'seqtype ' : 'func' , 'seqtype_label ' : 'bold' }
172+ {'datatype ' : 'func' , 'datatype_suffix ' : 'bold' }
173173
174174 # pdpn("bids_func_ses+_task-boo_run+") == \
175175 # order and PREFIX: should not matter, as well as trailing spaces
@@ -179,8 +179,8 @@ def test_parse_series_spec():
179179 pdpn ("WIP func_ses+_task-boo_run+" ) == \
180180 pdpn ("bids_func_ses+_run+_task-boo" ) == \
181181 {
182- 'seqtype ' : 'func' ,
183- # 'seqtype_label ': 'bold',
182+ 'datatype ' : 'func' ,
183+ # 'datatype_suffix ': 'bold',
184184 'session' : '+' ,
185185 'run' : '+' ,
186186 'task' : 'boo' ,
@@ -191,7 +191,7 @@ def test_parse_series_spec():
191191 pdpn ("bids_func-pace_ses-1_run-2_task-boo_acq-bu_bids-please__therest" ) == \
192192 pdpn ("func-pace_ses-1_task-boo_acq-bu_bids-please_run-2" ) == \
193193 {
194- 'seqtype ' : 'func' , 'seqtype_label ' : 'pace' ,
194+ 'datatype ' : 'func' , 'datatype_suffix ' : 'pace' ,
195195 'session' : '1' ,
196196 'run' : '2' ,
197197 'task' : 'boo' ,
@@ -201,24 +201,24 @@ def test_parse_series_spec():
201201
202202 assert pdpn ("bids_anat-scout_ses+" ) == \
203203 {
204- 'seqtype ' : 'anat' ,
205- 'seqtype_label ' : 'scout' ,
204+ 'datatype ' : 'anat' ,
205+ 'datatype_suffix ' : 'scout' ,
206206 'session' : '+' ,
207207 }
208208
209209 assert pdpn ("anat_T1w_acq-MPRAGE_run+" ) == \
210210 {
211- 'seqtype ' : 'anat' ,
211+ 'datatype ' : 'anat' ,
212212 'run' : '+' ,
213213 'acq' : 'MPRAGE' ,
214- 'seqtype_label ' : 'T1w'
214+ 'datatype_suffix ' : 'T1w'
215215 }
216216
217217 # Check for currently used {date}, which should also should get adjusted
218218 # from (date) since Philips does not allow for {}
219219 assert pdpn ("func_ses-{date}" ) == \
220220 pdpn ("func_ses-(date)" ) == \
221- {'seqtype ' : 'func' , 'session' : '{date}' }
221+ {'datatype ' : 'func' , 'session' : '{date}' }
222222
223223 assert pdpn ("fmap_dir-AP_ses-01" ) == \
224- {'seqtype ' : 'fmap' , 'session' : '01' , 'dir' : 'AP' }
224+ {'datatype ' : 'fmap' , 'session' : '01' , 'dir' : 'AP' }
0 commit comments