Merge branch 'master' into fix_issues

VUIIS · Mar 6, 2020 · edc148e · edc148e
2 parents c33f0b5 + 7c9cc7a
commit edc148e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/bin/Xnat_tools/XnatNDAR b/bin/Xnat_tools/XnatNDAR
@@ -769,7 +769,7 @@ def download_scan_file(xnat, directory, scan, resources, fname):
         if not os.path.exists(res_path):
             os.makedirs(res_path)
         # Select the scan:
-        scan_obj = XnatUtils.get_full_object(xnat, scan)
+        scan_obj = xnat.get_full_object(scan)
         for resource in resources:
             if resource in ['bval', 'bvec']:
                 if scan_obj.resource(resource.lower()).exists():
@@ -817,7 +817,7 @@ def download_assessor_file(xnat, directory, assessor, resources, fname):
     else:
         if not os.path.exists(res_path):
             os.makedirs(res_path)
-        assessor_obj = XnatUtils.get_full_object(xnat, assessor)
+        assessor_obj = xnat.get_full_object(assessor)
         for resource in resources:
             if resource:
                 res_obj = assessor_obj.out_resource(resource)

diff --git a/bin/Xnat_tools/Xnatsessionupdate b/bin/Xnat_tools/Xnatsessionupdate
@@ -143,7 +143,7 @@ def change_date_all(xnat, sessions_list):
     :return: None
     """
     for session_dict in sessions_list:
-        session_object = XnatUtils.get_full_object(xnat, session_dict)
+        session_object = xnat.get_full_object(session_dict)
         session_object.attrs.set('xnat:mrSessionData/original', ' ')
         msg = '   ->Session "%s" changed to need update.'
         print(msg % (session_dict['label']))

diff --git a/bin/freesurfer_tools/fs6upload b/bin/freesurfer_tools/fs6upload
@@ -129,7 +129,7 @@ if __name__ == '__main__':
         # print('diff aeg result='+str(res))
 
         # Upload the edits - brainmask, wm, aseg, control.dat,...
-        assessor_obj = XnatUtils.get_full_object(xnat, fs)
+        assessor_obj = xnat.get_full_object(fs)
         resource = assessor_obj.out_resource('EDITS')
         curtime = time.strftime("%Y%m%d-%H%M%S")
         brainmask_path = os.path.join(