In the participant data, replace <<session_id>> with a more explicit @ses- (instead of just @) (GitHub issue #267)

Author: marcelzwiers

bidscoin/plugins/__init__.py

@@ -66,7 +66,7 @@ def personals(self, bidsmap: 'BidsMap', datasource: 'DataSource', sesid: str='')
 
         personals = {}
         for dynkey, item in bidsmap.dataformat(datasource.dataformat).participant.items():
-            key = dynkey.replace('<<session_id>>', sesid.replace('ses-', '@'))
+            key = dynkey.replace('<<session_id>>', sesid.replace('ses-', '@ses-'))
             if dynkey in ('participant_id', 'session_id'):
                 continue
             else:

tests/test_bidscoiner.py

@@ -55,9 +55,9 @@ def test_bidscoiner_dicomdir(raw_dicomdir, bids_dicomdir, bidsmap_dicomdir):
     # sub-Archibald   ses-02CTHEADBRAINWOCONTRAST     42      n/a     n/a     n/a
     # sub-Peter       ses-01                          43      M       n/a     81.632700
     assert data[0] == list(meta.keys())
-    assert data[0] == ['participant_id', 'age@02CTHEADBRAINWOCONTRAST', 'sex', 'height', 'weight',    'age@01', 'age@03Brain', 'age@04BrainMRA']
-    assert data[1] == ['sub-Archibald',  '42',                          'n/a', 'n/a',    'n/a',       'n/a',    'n/a',         'n/a']
-    assert data[2] == ['sub-Peter',      'n/a',                         'M',   'n/a',    '81.632700', '43',     '45',          '45']
+    assert data[0] == ['participant_id', 'age@ses-02CTHEADBRAINWOCONTRAST', 'sex', 'height', 'weight',    'age@ses-01', 'age@ses-03Brain', 'age@ses-04BrainMRA']
+    assert data[1] == ['sub-Archibald',  '42',                              'n/a', 'n/a',    'n/a',       'n/a',        'n/a',              'n/a']
+    assert data[2] == ['sub-Peter',      'n/a',                             'M',   'n/a',    '81.632700', '43',         '45',               '45']
 
 
 def test_bidscoiner_dicomdir_skip(raw_dicomdir, bids_dicomdir, bidsmap_dicomdir):