allow all manufacturers for existing projects

SAFEHR-data · Jan 21, 2025 · 46d2109 · 46d2109
1 parent f1eed49
commit 46d2109
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 2 deletions.
diff --git a/pixl_dcmd/tests/test_main.py b/pixl_dcmd/tests/test_main.py
@@ -195,7 +195,7 @@ def ids_for_parameterised_test(val: pathlib.Path) -> str:
 
 @pytest.mark.parametrize(
     ("yaml_file"),
-    PROJECT_CONFIGS_DIR.glob("test-*.yaml"),
+    PROJECT_CONFIGS_DIR.glob("*.yaml"),
     ids=ids_for_parameterised_test,
 )
 def test_anonymise_and_validate_dicom(caplog, request, yaml_file) -> None:

diff --git a/projects/configs/despiad.yaml b/projects/configs/despiad.yaml
@@ -26,9 +26,14 @@ tag_operation_files:
         - "despiad.yaml"
     manufacturer_overrides: []
 
+allowed_manufacturers:
+  - regex: ".*"
+    exclude_series_numbers: []
+
 min_instances_per_series: 1
+
 series_filters: []
 
 destination:
-    dicom: "none"
+    dicom: "xnat"
     parquet: "none"
diff --git a/projects/configs/ms-pinpoint.yaml b/projects/configs/ms-pinpoint.yaml
@@ -23,6 +23,12 @@ tag_operation_files:
         - "ms-pinpoint.yaml"
     manufacturer_overrides: ["mri.yaml"]
 
+allowed_manufacturers:
+  - regex: ".*"
+    exclude_series_numbers: []
+
+min_instances_per_series: 1
+
 series_filters:
     - "localizer"
     - "localiser"

diff --git a/projects/configs/prognosis-ai.yaml b/projects/configs/prognosis-ai.yaml
@@ -23,6 +23,12 @@ tag_operation_files:
         - "ion-neuro-db.yaml"
     manufacturer_overrides: ["mri.yaml"]
 
+allowed_manufacturers:
+  - regex: ".*"
+    exclude_series_numbers: []
+
+min_instances_per_series: 1
+
 series_filters:
     - "localizer"
     - "localiser"

diff --git a/projects/configs/uclh-nasogastric-tube-project-ngt-only-full-dataset.yaml b/projects/configs/uclh-nasogastric-tube-project-ngt-only-full-dataset.yaml
@@ -22,6 +22,13 @@ tag_operation_files:
         - "base.yaml" #Expected base config file for any project
         - "xray.yaml"
     manufacturer_overrides: null
+
+allowed_manufacturers:
+  - regex: ".*"
+    exclude_series_numbers: []
+
+min_instances_per_series: 1
+
 destination:
     dicom: "ftps"
     parquet: "ftps"
diff --git a/projects/configs/uclh-prostate-mri-external-dataset.yaml b/projects/configs/uclh-prostate-mri-external-dataset.yaml
@@ -22,6 +22,13 @@ tag_operation_files:
         - "mri.yaml"
         - "diffusion-weighted-mri.yaml"
     manufacturer_overrides: ["mri.yaml", "mri-diffusion.yaml"]
+
+allowed_manufacturers:
+  - regex: ".*"
+    exclude_series_numbers: []
+
+min_instances_per_series: 1
+
 destination:
     dicom: "ftps"
     parquet: "ftps"
diff --git a/template_config.yaml b/template_config.yaml
@@ -22,6 +22,18 @@ tag_operation_files: # DICOM tag anonymisation operations
         - "base-tag-operations.yaml" # Base schema
     manufacturer_overrides: none # Manufactuer-dependendent overrides
 
+allowed_manufacturers:
+  - regex: ".*"  # allow all manufacturers
+    exclude_series_numbers: []
+
+min_instances_per_series: 1
+
+series_filters:
+    - "localizer"
+    - "localiser"
+    - "scout"
+    - "positioning"
+
 destination:
     dicom: "ftps" # alternatives: "dicomweb", "xnat", "none"
     parquet: "ftps" # alternatives: "none"