From 2746113c1fb1ea80f9bb33200a10762a157a8e10 Mon Sep 17 00:00:00 2001 From: John Wilkie <124276291+JBWilkie@users.noreply.github.com> Date: Tue, 17 Dec 2024 18:37:58 +0000 Subject: [PATCH] Update NifTI convert E2E (#982) Co-authored-by: John Wilkie --- .../from/2044737.fat.nii.json | 1725 +++++------------ .../to/2044737.fat_Reference_sBAT.nii.gz | Bin 0 -> 7310 bytes .../to/2044737.fat_poly1.nii.gz | Bin 8867 -> 0 bytes ...z => 2044737.fat_test_mask_basic_m.nii.gz} | Bin 7150 -> 6999 bytes 4 files changed, 530 insertions(+), 1195 deletions(-) create mode 100644 e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_Reference_sBAT.nii.gz delete mode 100644 e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_poly1.nii.gz rename e2e_tests/data/convert/nifti-legacy-scaling/to/{2044737.fat_mask1_m.nii.gz => 2044737.fat_test_mask_basic_m.nii.gz} (66%) diff --git a/e2e_tests/data/convert/nifti-legacy-scaling/from/2044737.fat.nii.json b/e2e_tests/data/convert/nifti-legacy-scaling/from/2044737.fat.nii.json index 9d7b56f10..f96c9fcee 100644 --- a/e2e_tests/data/convert/nifti-legacy-scaling/from/2044737.fat.nii.json +++ b/e2e_tests/data/convert/nifti-legacy-scaling/from/2044737.fat.nii.json @@ -5,17 +5,17 @@ "name": "2044737.fat.nii.gz", "path": "/", "source_info": { - "item_id": "0193542b-7af8-f2cc-1a15-25b9fc8c52c8", - "team": { - "name": "John staging", - "slug": "john-staging" - }, + "item_id": "0193ac69-454f-9764-7f19-3210e1ac309c", "dataset": { - "name": "DAR-4960", - "slug": "dar-4960", - "dataset_management_url": "https://staging.v7labs.com/datasets/511591/dataset-management" + "name": "MED_2D_VIEWER_ON", + "slug": "med_2d_viewer_on", + "dataset_management_url": "https://darwin.v7labs.com/datasets/1354683/dataset-management" + }, + "team": { + "name": "V7 John", + "slug": "v7-john" }, - "workview_url": "https://staging.v7labs.com/workview?dataset=511591&item=0193542b-7af8-f2cc-1a15-25b9fc8c52c8" + "workview_url": "https://darwin.v7labs.com/workview?dataset=1354683&item=0193ac69-454f-9764-7f19-3210e1ac309c" }, "slots": [ { @@ -24,32 +24,32 @@ "width": 224, "height": 174, "fps": null, - "thumbnail_url": "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/thumbnail", + "thumbnail_url": "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/thumbnail", "source_files": [ { "file_name": "2044737.fat.nii.gz", - "url": "https://staging.v7labs.com/api/v2/teams/john-staging/uploads/edc51515-6655-4971-abdc-624ef2170924" + "url": "https://darwin.v7labs.com/api/v2/teams/v7-john/uploads/4e098703-28ac-4843-aaab-06138562fc6a" } ], "frame_count": 17, "frame_urls": [ - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/0", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/1", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/2", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/3", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/4", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/5", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/6", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/7", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/8", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/9", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/10", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/11", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/12", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/13", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/14", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/15", - "https://staging.v7labs.com/api/v2/teams/john-staging/files/eb44711a-1ee5-4c38-88d0-c9cc4d695daa/sections/16" + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/0", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/1", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/2", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/3", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/4", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/5", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/6", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/7", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/8", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/9", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/10", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/11", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/12", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/13", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/14", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/15", + "https://darwin.v7labs.com/api/v2/teams/v7-john/files/46926ec5-76a7-4c24-a142-7d527126d50e/sections/16" ], "metadata": { "handler": "MONAI", @@ -59,7 +59,7 @@ 174, 17 ], - "SeriesInstanceUID": "1.2.826.0.1.3680043.8.498.14688033293578606435326463042448076904", + "SeriesInstanceUID": "1.2.826.0.1.3680043.8.498.10750507634885783767501509168547060521", "affine": "[[-2.232142925262451, 0.0, 0.0, 250.0], [0.0, -2.232142925262451, 0.0, 194.1964316368103], [0.0, 0.0, -3.0, 27.0], [0.0, 0.0, 0.0, 1.0]]", "colorspace": "RG16", "original_affine": [ @@ -96,334 +96,217 @@ "annotations": [ { "frames": { - "8": { + "1": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": true, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 - }, - { - "x": 178.8974, - "y": 226.8708 - }, - { - "x": 193.6933, - "y": 203.0329 - } - ] - ] - } - }, - "9": { - "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 148.4836, - "y": 193.9909 + "x": 170.1923, + "y": 154.7734 }, { - "x": 137.7976, - "y": 210.8418 + "x": 154.8077, + "y": 178.8118 }, { - "x": 178.8974, - "y": 226.8708 - }, - { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "10": { + "2": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 + "x": 170.1923, + "y": 154.7734 }, { - "x": 178.8974, - "y": 226.8708 + "x": 154.8077, + "y": 178.8118 }, { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "11": { + "3": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 + "x": 170.1923, + "y": 154.7734 }, { - "x": 178.8974, - "y": 226.8708 + "x": 154.8077, + "y": 178.8118 }, { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "12": { + "4": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 + "x": 170.1923, + "y": 154.7734 }, { - "x": 178.8974, - "y": 226.8708 + "x": 154.8077, + "y": 178.8118 }, { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "13": { + "5": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 + "x": 170.1923, + "y": 154.7734 }, { - "x": 137.7976, - "y": 210.8418 + "x": 154.8077, + "y": 178.8118 }, { - "x": 178.8974, - "y": 226.8708 - }, - { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "14": { + "6": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 + "x": 170.1923, + "y": 154.7734 }, { - "x": 178.8974, - "y": 226.8708 + "x": 154.8077, + "y": 178.8118 }, { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "15": { + "7": { "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 + "x": 170.1923, + "y": 154.7734 }, { - "x": 178.8974, - "y": 226.8708 + "x": 154.8077, + "y": 178.8118 }, { - "x": 193.6933, - "y": 203.0329 + "x": 194.2308, + "y": 183.6195 } ] ] } }, - "16": { - "bounding_box": { - "h": 32.87989999999999, - "w": 55.895700000000005, - "x": 137.7976, - "y": 193.9909 - }, - "keyframe": true, - "polygon": { - "paths": [ - [ - { - "x": 148.4836, - "y": 193.9909 - }, - { - "x": 137.7976, - "y": 210.8418 - }, - { - "x": 178.8974, - "y": 226.8708 - }, - { - "x": 193.6933, - "y": 203.0329 - } - ] - ] - } - } - }, - "global_sub_types": {}, - "id": "a88eccc0-70e5-4e8f-8550-85c8ac70b583", - "interpolate_algorithm": "linear-1.1", - "interpolated": true, - "name": "poly1", - "properties": [], - "ranges": [ - [ - 8, - 17 - ] - ], - "slot_names": [ - "0" - ] - }, - { - "frames": { "8": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, - "keyframe": true, + "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -431,34 +314,26 @@ }, "9": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -466,34 +341,26 @@ }, "10": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -501,34 +368,26 @@ }, "11": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -536,34 +395,26 @@ }, "12": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -571,34 +422,26 @@ }, "13": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -606,34 +449,26 @@ }, "14": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -641,34 +476,26 @@ }, "15": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": false, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -676,34 +503,26 @@ }, "16": { "bounding_box": { - "h": 41.09979999999999, - "w": 85.48750000000001, - "x": 252.877, - "y": 236.3237 + "h": 28.84609999999998, + "w": 39.42309999999998, + "x": 154.8077, + "y": 154.7734 }, "keyframe": true, "polygon": { "paths": [ [ { - "x": 264.3849, - "y": 236.7347 - }, - { - "x": 252.877, - "y": 275.7795 - }, - { - "x": 318.2256, - "y": 277.4235 + "x": 170.1923, + "y": 154.7734 }, { - "x": 338.3645, - "y": 249.0646 + "x": 154.8077, + "y": 178.8118 }, { - "x": 284.1128, - "y": 236.3237 + "x": 194.2308, + "y": 183.6195 } ] ] @@ -711,14 +530,14 @@ } }, "global_sub_types": {}, - "id": "c5148bb4-fba4-4522-8aaf-a5662c10db9d", + "id": "5e17e4d2-f4b3-4602-a288-a2e81e9d66cc", "interpolate_algorithm": "linear-1.1", "interpolated": true, - "name": "poly1", + "name": "Reference_sBAT", "properties": [], "ranges": [ [ - 8, + 1, 17 ] ], @@ -728,366 +547,40 @@ }, { "frames": { - "8": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, + "1": { "keyframe": true, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } - }, - "9": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } + "mask": {} }, - "10": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } + "2": { + "keyframe": true, + "mask": {} }, - "11": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } + "3": { + "keyframe": true, + "mask": {} }, - "12": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } + "4": { + "keyframe": true, + "mask": {} }, - "13": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } + "5": { + "keyframe": true, + "mask": {} }, - "14": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } - }, - "15": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": false, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } - }, - "16": { - "bounding_box": { - "h": 23.42689999999999, - "w": 41.92169999999999, - "x": 346.1735, - "y": 193.5799 - }, - "keyframe": true, - "polygon": { - "paths": [ - [ - { - "x": 367.1344, - "y": 193.5799 - }, - { - "x": 346.1735, - "y": 217.0068 - }, - { - "x": 377.4093, - "y": 216.1848 - }, - { - "x": 388.0952, - "y": 200.1559 - }, - { - "x": 386.0403, - "y": 196.8679 - } - ] - ] - } - } - }, - "global_sub_types": {}, - "id": "f6b00d67-2052-43f1-93b6-a6c5c66fb884", - "interpolate_algorithm": "linear-1.1", - "interpolated": true, - "name": "poly1", - "properties": [], - "ranges": [ - [ - 8, - 17 - ] - ], - "slot_names": [ - "0" - ] - }, - { - "frames": { - "8": { - "keyframe": true, - "mask": {} - }, - "9": { - "keyframe": true, - "mask": {} - }, - "10": { - "keyframe": true, - "mask": {} - }, - "11": { + "6": { "keyframe": true, "mask": {} } }, - "id": "6e1b243d-b70c-4d0a-9e7f-5ed9ce36559c", + "id": "bfc7284c-7aae-47fa-bd50-16c74e4d8168", "interpolate_algorithm": "linear-1.1", - "name": "mask1", + "name": "test_mask_basic", "only_keyframes": true, "properties": [], "ranges": [ [ - 8, - 12 + 1, + 7 ] ], "slot_names": [ @@ -1096,406 +589,218 @@ }, { "frames": { - "8": { + "1": { "keyframe": true, "raster_layer": { "dense_rle": [ 0, - 17366, - 1, - 4, - 0, - 218, + 21208, 1, - 8, - 0, - 215, - 1, - 9, + 6, 0, - 215, + 216, 1, 10, 0, 213, 1, - 11, - 0, - 212, - 1, - 12, - 0, - 212, - 1, 12, 0, 211, 1, - 12, - 0, - 212, - 1, - 12, - 0, - 212, - 1, - 12, - 0, - 211, - 1, - 12, - 0, - 212, - 1, - 12, - 0, - 212, - 1, - 11, - 0, - 213, - 1, - 11, - 0, - 213, - 1, - 10, - 0, - 215, - 1, - 9, - 0, - 215, - 1, - 8, + 14, 0, - 218, + 210, 1, - 4, + 14, 0, - 2404, + 209, 1, - 7, + 16, 0, - 215, + 208, 1, - 11, + 16, 0, - 212, + 208, 1, - 13, + 16, 0, - 211, + 208, 1, - 13, + 16, 0, - 210, + 208, 1, - 15, + 16, 0, 207, 1, 17, 0, - 206, - 1, - 18, - 0, - 206, - 1, - 18, - 0, - 205, - 1, - 19, - 0, - 204, - 1, - 19, - 0, - 120, - 1, - 6, - 0, - 79, - 1, - 19, - 0, - 118, - 1, - 10, - 0, - 77, - 1, - 18, - 0, - 119, + 207, 1, - 10, + 17, 0, - 77, + 207, 1, - 18, + 17, 0, - 118, + 207, 1, - 12, + 17, 0, - 76, + 208, 1, 16, 0, - 120, + 208, 1, - 12, + 16, 0, - 76, + 208, 1, - 15, + 16, 0, - 121, + 208, 1, - 12, + 16, 0, - 76, + 209, 1, - 15, + 14, 0, - 121, + 210, 1, - 12, + 14, 0, - 77, + 211, 1, 12, 0, - 124, - 1, - 10, - 0, - 78, - 1, - 11, - 0, - 125, + 213, 1, 10, 0, - 80, - 1, - 7, - 0, - 129, + 216, 1, 6, 0, - 11230 + 12834 ], "mask_annotation_ids_mapping": { - "6e1b243d-b70c-4d0a-9e7f-5ed9ce36559c": 1 + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 }, "total_pixels": 38976 } }, - "9": { + "2": { "keyframe": true, "raster_layer": { "dense_rle": [ 0, - 18701, + 20312, 1, - 5, - 0, - 217, - 1, - 9, + 7, 0, - 214, + 215, 1, - 12, + 11, 0, 212, 1, - 12, - 0, - 211, - 1, - 14, - 0, - 210, - 1, - 14, - 0, - 210, - 1, - 14, + 13, 0, 210, 1, - 14, - 0, - 211, - 1, - 12, - 0, - 212, - 1, - 12, - 0, - 214, - 1, - 8, - 0, - 3510, - 1, - 6, - 0, - 216, - 1, - 11, - 0, - 212, - 1, 15, 0, 209, 1, - 17, - 0, - 206, - 1, - 18, - 0, - 206, - 1, - 20, - 0, - 204, - 1, - 20, - 0, - 204, - 1, - 21, + 15, 0, - 124, + 208, 1, - 6, + 17, 0, - 73, + 207, 1, - 21, + 17, 0, - 122, + 207, 1, - 10, + 17, 0, - 70, + 207, 1, - 22, + 17, 0, - 122, + 207, 1, - 10, + 17, 0, - 70, + 207, 1, - 22, + 17, 0, - 121, + 207, 1, - 12, + 17, 0, - 69, + 208, 1, - 22, + 16, 0, - 121, + 208, 1, - 12, + 16, 0, - 68, + 208, 1, - 23, + 16, 0, - 121, + 208, 1, - 12, + 16, 0, - 68, + 208, 1, - 22, + 16, 0, - 122, + 209, 1, - 12, + 14, 0, - 68, + 210, 1, - 22, + 14, 0, - 122, + 211, 1, 12, 0, - 68, - 1, - 21, - 0, - 123, - 1, - 11, - 0, - 70, - 1, - 20, - 0, - 124, - 1, - 10, - 0, - 70, - 1, - 18, - 0, - 127, - 1, - 8, - 0, - 72, - 1, - 13, - 0, - 131, - 1, - 8, - 0, - 73, + 213, 1, 10, 0, - 135, - 1, - 4, - 0, - 78, + 216, 1, - 5, + 6, 0, - 10033 + 13953 ], "mask_annotation_ids_mapping": { - "6e1b243d-b70c-4d0a-9e7f-5ed9ce36559c": 1 + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 }, "total_pixels": 38976 } }, - "10": { + "3": { "keyframe": true, "raster_layer": { "dense_rle": [ 0, - 19374, + 20759, 1, 6, 0, @@ -1503,421 +808,451 @@ 1, 10, 0, - 214, + 212, + 1, + 13, + 0, + 209, + 1, + 16, + 0, + 207, + 1, + 17, + 0, + 206, + 1, + 19, + 0, + 205, + 1, + 19, + 0, + 204, 1, - 10, + 20, 0, - 213, + 204, 1, - 12, + 20, 0, - 212, + 204, 1, - 12, + 20, 0, - 212, + 204, 1, - 12, + 20, 0, - 212, + 204, 1, - 12, + 20, 0, - 213, + 204, 1, - 10, + 20, 0, - 214, + 204, 1, - 10, + 20, 0, - 216, + 204, 1, - 6, + 19, 0, - 3741, + 205, 1, - 5, + 19, 0, - 217, + 206, 1, - 9, + 18, 0, - 213, + 207, 1, - 11, + 17, 0, - 213, + 207, 1, - 12, + 17, 0, - 211, + 208, 1, - 13, + 15, 0, - 114, + 209, 1, - 4, + 15, 0, - 93, + 210, 1, 13, 0, - 112, + 212, 1, - 8, + 11, 0, - 91, + 215, 1, - 14, + 7, + 0, + 13060 + ], + "mask_annotation_ids_mapping": { + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 + }, + "total_pixels": 38976 + } + }, + "4": { + "keyframe": true, + "raster_layer": { + "dense_rle": [ 0, - 111, + 20979, 1, - 8, + 7, 0, - 91, + 215, 1, - 14, + 11, 0, - 110, + 212, 1, - 10, + 13, 0, - 90, + 210, 1, 15, 0, - 108, + 209, 1, - 11, + 16, 0, - 90, + 207, 1, - 15, + 18, 0, - 107, + 206, 1, - 14, + 19, 0, - 89, + 205, 1, - 15, + 20, 0, - 104, + 204, 1, - 16, + 21, 0, - 89, + 203, 1, - 15, + 21, 0, - 103, + 203, 1, - 18, + 22, 0, - 89, + 203, 1, - 14, + 21, 0, - 102, + 203, 1, - 19, + 22, 0, - 90, + 203, 1, - 13, + 21, 0, - 101, + 204, 1, - 20, + 21, 0, - 91, + 202, 1, - 11, + 22, 0, - 102, + 202, 1, - 20, + 22, 0, - 93, + 203, 1, - 9, + 21, 0, - 101, + 203, 1, - 20, + 21, 0, - 97, + 203, 1, - 4, + 21, 0, - 103, + 204, 1, 20, 0, 204, 1, - 19, + 20, 0, 205, 1, - 19, - 0, - 206, - 1, - 17, + 18, 0, 207, 1, - 15, + 17, 0, - 210, + 209, 1, - 12, + 14, 0, - 214, + 212, 1, - 9, + 11, 0, - 218, + 215, 1, - 4, + 7, 0, - 8565 + 12159 ], "mask_annotation_ids_mapping": { - "6e1b243d-b70c-4d0a-9e7f-5ed9ce36559c": 1 + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 }, "total_pixels": 38976 } }, - "11": { + "5": { "keyframe": true, "raster_layer": { "dense_rle": [ 0, - 18703, + 21427, 1, 4, 0, - 218, + 4, 1, - 8, + 6, 0, - 216, + 207, 1, - 8, + 19, 0, - 215, + 203, 1, - 10, + 22, 0, - 214, + 201, 1, - 10, + 24, 0, - 214, + 199, 1, - 10, + 25, 0, - 214, + 199, 1, - 10, + 26, 0, - 215, + 197, 1, - 8, + 27, 0, - 216, + 197, 1, - 8, + 27, 0, - 218, + 197, 1, - 4, + 27, 0, - 4775, + 197, 1, - 4, + 27, 0, - 218, + 197, 1, - 8, + 27, 0, - 216, + 197, 1, - 8, + 27, 0, - 215, + 197, 1, - 10, + 27, 0, - 214, + 197, 1, - 10, + 27, 0, - 214, + 198, 1, - 10, + 26, 0, - 214, + 198, 1, - 10, + 26, 0, - 214, + 199, 1, - 10, + 24, 0, - 214, + 201, 1, - 10, + 23, 0, - 214, + 202, 1, - 10, + 21, 0, - 214, + 203, 1, - 10, + 21, 0, - 214, + 204, 1, - 11, + 20, 0, - 115, + 205, 1, - 4, + 18, 0, - 94, + 207, 1, - 11, + 17, 0, - 113, + 208, 1, - 8, + 15, 0, - 92, + 210, 1, - 11, + 13, 0, - 113, + 213, 1, - 8, + 9, 0, - 93, - 1, - 10, + 11937 + ], + "mask_annotation_ids_mapping": { + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 + }, + "total_pixels": 38976 + } + }, + "6": { + "keyframe": true, + "raster_layer": { + "dense_rle": [ 0, - 112, + 21660, 1, - 10, + 2, 0, - 92, + 219, 1, 10, 0, - 112, + 212, 1, - 10, + 14, 0, - 92, + 209, 1, - 10, + 16, 0, - 112, + 207, 1, - 10, + 18, 0, - 92, + 205, 1, - 10, + 19, 0, - 112, + 204, 1, - 10, + 21, 0, - 57, + 202, 1, - 4, + 22, 0, - 32, + 202, 1, - 8, + 22, 0, - 114, + 201, 1, - 8, + 23, 0, - 56, + 201, 1, - 8, + 23, 0, - 30, + 201, 1, - 8, + 23, 0, - 114, + 200, 1, - 8, + 24, 0, - 56, + 200, 1, - 10, + 24, 0, - 30, + 201, 1, - 4, + 23, 0, - 118, + 201, 1, - 4, + 22, 0, - 57, + 202, 1, - 12, + 22, 0, - 212, + 202, 1, - 12, + 21, 0, - 212, + 204, 1, - 13, + 19, 0, - 211, + 205, 1, - 13, + 18, 0, - 212, + 207, 1, - 12, + 16, 0, - 212, + 209, 1, - 12, + 13, 0, 213, 1, - 10, - 0, - 216, - 1, 8, 0, - 218, - 1, - 4, - 0, - 7012 + 12386 ], "mask_annotation_ids_mapping": { - "6e1b243d-b70c-4d0a-9e7f-5ed9ce36559c": 1 + "bfc7284c-7aae-47fa-bd50-16c74e4d8168": 1 }, "total_pixels": 38976 } } }, - "id": "13a9ac66-1bbf-42ac-9215-95fb83c6670d", + "id": "6fd53171-fea3-4b2d-94c5-a61129ea8297", "name": "__raster_layer__", "only_keyframes": true, "properties": [], diff --git a/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_Reference_sBAT.nii.gz b/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_Reference_sBAT.nii.gz new file mode 100644 index 0000000000000000000000000000000000000000..028727491ad8f2c82cce6d1098f5883f26a6a159 GIT binary patch literal 7310 zcmeI0`&ZIu9LJSFaL%+c%`RGJO;0YftCtY9-1Kafbf$@dsp+Oi@hjqHnir7SF_*V) zYB$72%@#4Wgx2!bMQAxM9Rv$bK!*&2A()7ud||LZ!LuLm9G;(^pP$$Be%`Oo<6Dbx zur8=sHGbg2yBKd+y7PTMO;{2Uf_yR|{WPKy6VZSkJ*;OG+f`0ACH#>4wWAmwxxF8qhMtw<7wM64WRq6PC6}Akkrj(GlAHzI)BZ@( zeQ;i`ZZ_y9xWgvRDP^PFs2_EcfO4|Lh`&l&n2fF_lS;K8$RvHibPl%g2=8MYIF~s> zBmI_KFELMc6ydiT>(!pU;W#$SfAi7k(zJ$XI~`FUI>y-bRo= zTNLE3ocagCA0LvvMytztUM82DKe#%YRmbV=6LE%b$sN5)gEwr!X|yCJyYzUvNTO65 zhLT}Ir_s_F`ND;$efnF)MpX~w5Lu3*T?Cs4jJO~@a#@{_4Z$qv90(7bc+BktuR-rH zLH)0^vJdVQE3fE=?|C6E+6q8UNafVRo%0qI+3-y-*dYill{ve?b4Edd;4@WkDDZo8 zM<4*ch|GheMkKXi88cGZD^mF;n7xf-ep1=3Bnic788ztfjZO% zXp+l>@>UBv)I_&n7Fv#^WrLTg@44IY$ClHhWINn8M@jP`v)w7hxUqw79=F*#*@_UB z775b7(&TqavlZd-DpQ75Qg-Z0)avdh5h)^j=U~^=Y%S>a3r|cQ={tHGsSDUM(d-y zIxm|tu_bPm4ipjeea^%D#ij?1tE}X9$-9&|=zrwyoh@!yW6fM6vV|(~vu3Ura3yTo zHdf3YX$)`bmF(yY7KnSnd2x7R8^D}yM4f*_SaVyD+oPHgM_}7ZaU422(=4(y9l^{> z+Zc4z)rY*=Uyp+HQTt<6hx@OL{;?7B1xk8yS?WblPXKrI-0Y3X7eq;WT#Ssh?3X)`%{~D zp?fSjtIr`0j$5TaX1B{7 zJ_82(ySOBej_R?f2&R0jrjjop)zx^d&#*w+y0_%;-M$W0xL;P@IUo((9(?j>r=`Vw zJa+GYAxtXs+7uR$VsVdHSe;uulfTY4bbI<7yY9r>>Ka~f=$Fzz&hgVzIuAe$CsTW; z3<}5VG`lG-X#{-c@;9$=5MGZ+0#w|Zk{esBeRZ&k`%Ga;P-X_l>9vkOnvn^IDUmq& zfh~0U-FjB>%k%UnEGEAqVL-o=kFB4fJcT3@hSquJ*MtI9(a;8$WLFMs!`5>IIls2m z9-SqDu}YXdI<`DT*rQ{^x@nJ&Jvw$_vkRN8%qsue552v0?5$&;b(XBuwtaNrN2O-C LaJ)_$=Hc)!vgmO; literal 0 HcmV?d00001 diff --git a/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_poly1.nii.gz b/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_poly1.nii.gz deleted file mode 100644 index fb49c53ffe4e2592d37e83170679076fca20ed4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8867 zcmeI0|5MU=9>-gwE!}Q+%eKAtLT$aGY^>JOLJqXnqFR+m#j@1hE7LTuIzTjH$3`YNbReNV$S`HK!g586bherwk?gh@=D`5rIShf}JL3x;Z{SedalzdCz=4 zpXclGdcI!XmzOP?yI>CeP{hy1?(-ji->T<53eJxmSn{V>>9#=*de(II zGJVFR(Fdt>#w!SP3rKTh1_~ULEJxDJQ`ARpuw|e7g#Nf_L2j0B+Gg`6^MU*`V;AV$KLGiCQqtlZ!aOS{jIt$$(pedo&qt}7?ikFWQqggD&<9>`gI2NI(HQ^bg zmE?9sbw<-vfO_Wjk-mGZxIgrAa=d?0?gIwH7j^M>Obo$>{$_9_rmwK8 zaf@^$whQ;wNKf}K9bPqDNt$gWB&0t>A+0t_D7@jTO(vV%I781(tmzuJp5_xMMB+1zd53OerNmf6nG?Z~pnb@%&T4PUEbbS!-HwD>ode8SZlJ03ZVk^f`sSfKZ{Tb#9xP3d=!PM8C^49u%+%p^hcDR z{I)r)DKak%5~Ah`J+an5HZ|;wFB!nbYYu296G-BF{}E+^jVA)Ta#Pc{bxg2Z$gKiS zj_7!0GVVogM@Q_{tOo;$=4)Z1JB-*sgcqkRoRJ6*Ieiu3d%;dAc#7ee7>?O6Nj#1u z4guvwQOyHTtORseXoX%ah6Z)q*u4ua+tW?74#mr~t)SWFh1!LZX6a~=XJ6B{8fWZW zhX7E-hurCUMMhco!>eAlXYFcuT^=(4e{1u+ac~rld0=?*t(+=fzfc5v@5Wik1K*Un zCGuYZxD6RuTR!jGk|+WP@taE}8&&wq2vfMvwFu!qWB3W1OK}@D_{vD9!i*GNlk*cc zl}ZqU_=-sV5ueHkp_hUmx2Y6|0Pqz!r^1R9`eGiYR)=CLso417@)LQ~Ab-^G_ND=M zZa4ynV&F#h`>?`A#jjv#ayNg^A}AUW-Lcn)iRY>gtC@|kngi*a`0`#Pu;Lk0Zd4m& zT!@mVEA%%UXLT21Vd46MYsvFHBy__$$M3+v+nuw9T71s5cF1V4M6T7B-DPSr(Q)2H zGU6XyIcj8=-&QG`Q!HO=y~TSt+r}4mHxjbB*?3> z+g}I7=Mrac;F(vJ&w%R=TH6N_?M6>D39UvtnqoIc_QU~+XpTb%t*7(~Sy^dy^JtVq zwuBOnplJ}wnIq?5HG~x0f&{&wRceQF6G^uFUbQ;?xG(Wsu~GG+>UJ#QDCr4=EA^`& zO>2eUeimblVf^1ya?b3XI1j42h8|MUt9%f;<5#Lb=PZ^Tim6S(rU%Kl=cNQ$;s|Pr zQ@NgvO%HY|*};}n0zjz?#jws`lY)6C^3DWVD93?Rr&3MDCSjZkHP})-4RdnQa%Kun z9E&bqGNt5>7f77&d=gMi#l>UFee7+eU0#1v5n`O%3L=Om5NT=&L+i8H)BW1KK+Zb z42e#MI?u)Zi$al_QfRV~>M$<@QMb0SJ)AELCS;5^418<^HNln1gVr{FFOO_qH33<3 z_MT>>*^)R1xZ@OZOvdo!ZBeF0K3TSp91!q|lfO}KjH6p5xVJ;5Oxk5_sGj{uJLy{|0x5$E3Q!K3Y81A-g#F`xA z7jPT??znUhm diff --git a/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_mask1_m.nii.gz b/e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_test_mask_basic_m.nii.gz similarity index 66% rename from e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_mask1_m.nii.gz rename to e2e_tests/data/convert/nifti-legacy-scaling/to/2044737.fat_test_mask_basic_m.nii.gz index 23c8753221f19ae48805d1d5d0cf02894b19fe51..e73badf53664f8b3a346317a442ceae59c770df2 100644 GIT binary patch delta 1568 zcmaiweNd7I9LJN>UE0gF)N0$AY)$he&0ZD|nzkY}6vGq~QoBkGNlgt6P>6M9TG>`+ z4HcUcNeBsju!KNwWu_%Y2Bi3!8Hzp9dQ=j^ru%z$`~CU7-+k`;{Y)WrJ6P_QmM&R5 z`!Aq+_qG1*E?*r%+^cpE({_9pJ$%~ILR+zp29!oeAKmsA0{?pX)rk~6|26Xw-pPW9<_L9)Rr#ADT zK2UgOK>iYMxY|=J2(7$rQdZZLr4?Y^axA>N)s`(A$K^sV{uptH&|c0&)qT1-8u=nG zG;9AejZ#{Iv}F_2n?oyZo4D1bWt0MvTb5<)Zgo-#a=AA(;7MKVLI$5ICPANoNXmS~ofT|ahECd|wXe|B7(TdY1VpFd^jxH8FgAy!f&eCcUaL87H(E0&@N1CXhln1^Xu^}FaLP^Ylq z1h6BS+Y`-`c38&qyhRTO3qwf<-+3!y$do21&l*ioXByU$$$xqM!H|}{Lo>wYhGJ&0 zJRA*SCi=zFZ9~0iMO7>?`rZe8zBZkg)1p=7r<$gj1a(QH5ZIPfsR+nz@jJ~F@Oj=W&Xnp3BIWzB5N57lDBV8P%TU~mowxR4h~=B3#>e(kpvsn^o6vq% zP|Ln@=UQ(+QD23qsy?%Mz*8v_56w#?8|+vIqK3Cd1kX%SdnO%fJFaw#gLRJjWtVAV zQTm~&3%aFmi@JQpr~$d&>3L(ZR-ZdOJp;oN@#(e|gZKG&i|iY%CU#a!1~?s4zS( zD}7*YurC^p^Qq71Eo{^|J`Trds0IcF%l6{)`pOEBjLOz%02jR5Z^*EOWONKK{7o$6ctqz02LPku$B_OxTY{#S=}X5?Kqo18tGGlv>{z2`{8$$20Y zF}2D0R%%)OGgX6J8N$)!$F{g5%9cKdI&~iWUJ?o3O-Za9_|3Y0?X6T-k$Z5LO15B% zCd!D)U>t^b`v?M=+)AoLHBe0)sPCV>6H*!*!YNZV4jEyS@2axHUIAvN^Etjrx#`*@u14s&o@Sg#b zu7Wsm7RiaMmo(y>tgX&6fm+Zq(O%saZXl0MuHhT`hCnfm=N^1%&BjXp4Kb-gP{oBF zzPrKP)K_tu8z;-ispZOW5JybEc7m#2bmZ)B&|2qP2J0y@@z)2fTBu@r~GUSa~g z%ZC`7*>TaQLfxH6b9hAz%zn%@B|y6&?ol58oGc!bw!9B z&}AU;!cw@y^e9folRGm>96SDIbY;g$?EieHs#IF>`^)LB&)27aPk)@gKfQeUj$iub z^xgjppZ@yr&$sW+Kc~~X*Pl;6kAMDrf4LsNz2DVW$pZ07#Z>561bB=qKUiIzLPW5Te(s?@-^qn;ASvoJT z5~r6xdA}3as5$mX$I=z0XP@UieAcXa&Apzn-~0S$GB15+?V4l1rMVt|KTb}^$9HM# ze~q-(n738IkT&wC<8b$wv$WQjw_0iBPsdhkxi@!OYs~L`x3=dZe>&EdaqT>5tubHw zjB@)$1u>R8d9RbA(($-gnx*HCtLWj+57UY-*GnDud_OAMGefzvquTLU?tCXL6&QE! za zJGjj$cHK%q|F)7Xw{P^Y+=)&ilQ97%SU}AJ{#8}Y-I>o8y^C@FX?JTAh`z;GTRwT_ z1fpx{IQP7JbqS<>i+NoMrI{0mo~7g5^X}CpkoGO+btRN$ULd*_VLpm0xze_cdh;GQ%)dyH;m=ZcG6OTp=;yW(tW+Zy}-C*)2r>z zcf#`m({5c~Kfkv(w-&hWR&HhM6!w2sAlI$ywP$zt-nIhQoyxClo1*mYQDf8CBL%#q1twgyhV(qPW+q@su z<;NClI!-0`=;y1A)q8fR?U~4)j}<@P#87592gt4*)(-J`DO(hAP= zqkpFL4%h8g9x*kvTfzOwqt@&3{yjXopTKqBE-U*ba`IyW`3^p|ho|=wxbEM6S)BZw zz|h0z-uD)f(H>ilBryCP>hb^8+mZTqt|jeV%#T*%k?V<`rQ?z7JyvaL*V6g1syuEr zY0uL6aVtJnWoggS`LU`zZZ&Do()n>KK3ZjI*J6IO8joC0^ei2ZT<;NU)4L;fRZWq> z{eK=6csa%Q(Kkyz-$KTc9+$I1B^}GBc)Dh@yTV=zgsH9 zy8hK75IKh4+%t=}_8xC#-8)zL^KVJy)_=>VyLDnN-FdCQ&n=1EdQCdD=PPBEbGWru zD$_mZTFzsDjw^KpiNuyuWv2T@Ds-Jc(y>6w3o^z)Cn$CN6X{GjQ&(iBw zYUnv<+OO%nXP0(rpLQ*-+o_=Mq|vYG*tbes)lYlpPw;K^@0@n%VSCvnCbKaC0s()v z5qLQb-)&B4Y1hHxJgfaPPJ6kkJ@aS)AAE{j`^OE6ZCFm-Veq zUAphB)Jykm@BLd6`qx4)=et+$@1VDGw_v_j##;vI`dVkLzfYPn=IftQ^NvyV+*oh^ zT@1PBlyK!5-N0t5&UAkd;f{8z0Ov-h4kdKY8w9&ObhT^q)>^7nt9cIewM z>)oWC`iGvSvv%_Lo;2;+Fz;QZmHLN{jc2Xo?>*lo()&MyR=gO(6RBXmHfTu9Ct0QdRJ+u{^(dbwv%4cQ}Taeiyl&G nNg%owV@ug(y$I-?UkL;V5FoL|FAELe7y|zRx7F-$;5ifkCWX)x