brainles-preprocessing 0.6.3__tar.gz → 0.6.5__tar.gz

{brainles_preprocessing-0.6.3 → brainles_preprocessing-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: brainles_preprocessing
-Version: 0.6.3
+Version: 0.6.5
 Summary: Tool for preprocessing tasks in biomedical imaging, with a focus on (but not limited to) multi-modal brain MRI
 License: Apache-2.0
 Keywords: brain tumor,glioma,BraTS,skullstripping,brain extraction
@@ -30,7 +30,7 @@ Requires-Dist: nipreps-synthstrip (>=0.0.1,<0.0.2) ; extra == "all" or extra ==
 Requires-Dist: numpy (>=1.23.0,<2.0.0)
 Requires-Dist: picsl_greedy (>=0.0.6,<0.0.7) ; extra == "all" or extra == "picsl-greedy"
 Requires-Dist: rich (>=13.6.0,<14.0.0)
-Requires-Dist: scipy (<1.14)
+Requires-Dist: scipy (>=1.14,<2.0)
 Requires-Dist: simpleitk (>=2.2.1)
 Requires-Dist: tqdm (>=4.64.1,<5.0.0)
 Requires-Dist: ttictoc (>=0.5.6,<0.6.0)

{brainles_preprocessing-0.6.3 → brainles_preprocessing-0.6.5}/brainles_preprocessing/registration/ANTs/ANTs.py

@@ -101,24 +101,30 @@ class ANTsRegistrator(Registrator):
 
         fixed_image = ants.image_read(str(fixed_image_path))
         moving_image = ants.image_read(str(moving_image_path))
+
         registration_result = ants.registration(
             fixed=fixed_image,
             moving=moving_image,
             **registration_kwargs,
         )
-        transformed_image = registration_result["warpedmovout"]
 
         # Ensure output directories exist
         transformed_image_path.parent.mkdir(parents=True, exist_ok=True)
         matrix_path.parent.mkdir(parents=True, exist_ok=True)
 
-        ants.image_write(transformed_image, str(transformed_image_path))
-
         shutil.copyfile(
             src=registration_result["fwdtransforms"][0],
             dst=str(matrix_path),
         )
 
+        self.transform(
+            fixed_image_path=fixed_image_path,
+            moving_image_path=moving_image_path,
+            transformed_image_path=transformed_image_path,
+            matrix_path=matrix_path,
+            log_file_path=log_file_path,
+        )
+
         end_time = datetime.datetime.now()
 
         # TODO nicer logging
@@ -147,6 +153,7 @@ class ANTsRegistrator(Registrator):
     ) -> None:
         """
         Apply a transformation using ANTs.
+        By default the padding value corresponds to the minimum of the moving image. Can be adjusted using the defaultvalue parameter.
 
         Args:
             fixed_image_path (str or Path): Path to the fixed image.
@@ -195,6 +202,11 @@ class ANTsRegistrator(Registrator):
         fixed_image = ants.image_read(str(fixed_image_path))
         moving_image = ants.image_read(str(moving_image_path))
 
+        if "defaultvalue" not in transform_kwargs:
+            transform_kwargs["defaultvalue"] = (
+                moving_image.min()
+            )  # set out of view voxels by default to min value, i.e. air/ bg
+
         # Ensure output directory exist
         transformed_image_path.parent.mkdir(parents=True, exist_ok=True)
 

{brainles_preprocessing-0.6.3 → brainles_preprocessing-0.6.5}/brainles_preprocessing/registration/niftyreg/niftyreg.py

@@ -8,6 +8,7 @@ from typing import List
 import numpy as np
 from auxiliary.runscript import ScriptRunner
 from auxiliary.turbopath import turbopath
+from auxiliary.io import read_image
 
 from brainles_preprocessing.registration.registrator import Registrator
 
@@ -79,12 +80,16 @@ class NiftyRegRegistrator(Registrator):
 
         matrix_path = Path(matrix_path).with_suffix(".txt")
 
+        # read moving image to get padding value
+        padding_value = float(read_image(moving_image_path).min())
+
         input_params = [
             turbopath(niftyreg_executable),
             turbopath(fixed_image_path),
             turbopath(moving_image_path),
             turbopath(transformed_image_path),
             str(matrix_path),
+            str(padding_value),
         ]
 
         # Call the run method to execute the script and capture the output in the log file
@@ -155,6 +160,7 @@ class NiftyRegRegistrator(Registrator):
     ) -> None:
         """
         Apply a transformation using NiftyReg.
+        By default the padding value corresponds to the minimum of the moving image.
 
         Args:
             fixed_image_path (str): Path to the fixed image.
@@ -199,13 +205,17 @@ class NiftyRegRegistrator(Registrator):
         else:
             transform_path = Path(matrix_path).with_suffix(".txt")
 
+        # read moving image to get padding value
+        padding_value = float(read_image(moving_image_path).min())
+
         input_params = [
             turbopath(niftyreg_executable),
             turbopath(fixed_image_path),
             turbopath(moving_image_path),
             turbopath(transformed_image_path),
             str(transform_path),
-            interpolator,  # interpolation method, 3 is Cubic
+            str(interpolator),  # interpolation method, 3 is Cubic
+            str(padding_value),
         ]
 
         # Call the run method to execute the script and capture the output in the log file

{brainles_preprocessing-0.6.3 → brainles_preprocessing-0.6.5}/brainles_preprocessing/registration/niftyreg/niftyreg_scripts/rigid_reg.sh

@@ -10,8 +10,8 @@ file_exists() {
 }
 
 # Check if the correct number of arguments is provided
-if [ "$#" -ne 5 ]; then
-    echo "Usage: $0 <niftyreg_executable> <fixed_image> <moving_image> <transformed_image> <transformation_matrix>"
+if [ "$#" -ne 6 ]; then
+    echo "Usage: $0 <niftyreg_executable> <fixed_image> <moving_image> <transformed_image> <transformation_matrix> <padding_value>"
     exit 1
 fi
 
@@ -21,6 +21,7 @@ fixed_image="$2"
 moving_image="$3"
 transformed_image="$4"
 transformation_matrix="$5"
+padding_value="$6"
 
 # Validate the existence of input files
 if ! file_exists "$fixed_image"; then
@@ -41,6 +42,7 @@ registration_options=(
     "-flo" "$moving_image"
     "-res" "$transformed_image"
     "-aff" "$transformation_matrix"
+    "-pad" "$padding_value"
 )
 
 # Perform rigid-only registration with NiftyReg

{brainles_preprocessing-0.6.3 → brainles_preprocessing-0.6.5}/brainles_preprocessing/registration/niftyreg/niftyreg_scripts/transform.sh

@@ -10,8 +10,8 @@ file_exists() {
 }
 
 # Check if the correct number of arguments is provided
-if [ "$#" -ne 6 ]; then
-    echo "Usage: $0 <niftyreg_executable> <fixed_image> <moving_image> <transformed_image> <transformation_matrix> <interpolation_method>"
+if [ "$#" -ne 7 ]; then
+    echo "Usage: $0 <niftyreg_executable> <fixed_image> <moving_image> <transformed_image> <transformation_matrix> <interpolation_method> <padding_value>"
     exit 1
 fi
 
@@ -22,6 +22,7 @@ moving_image="$3"
 transformed_image="$4"
 transformation_matrix="$5"
 interpolation_method="$6"
+padding_value="$7"
 
 # Validate the existence of input files
 if ! file_exists "$fixed_image"; then
@@ -51,6 +52,7 @@ resample_command=(
     -trans "$transformation_matrix"
     -res "$transformed_image"
     -inter "$interpolation_method"
+    -pad "$padding_value"
 )
 
 if file_exists "$niftyreg_path"; then

{brainles_preprocessing-0.6.3 → brainles_preprocessing-0.6.5}/pyproject.toml

@@ -14,7 +14,7 @@ exclude = [
 ]
 
 name = "brainles_preprocessing"
-version = "0.6.3"                                                                                                              # will be overwritten by poetry-dynamic-versioning but needs to be set
+version = "0.6.5"                                                                                                              # will be overwritten by poetry-dynamic-versioning but needs to be set
 description = "Tool for preprocessing tasks in biomedical imaging, with a focus on (but not limited to) multi-modal brain MRI"
 license = "Apache-2.0"
 
@@ -57,7 +57,7 @@ simpleitk = ">=2.2.1"
 
 # registration
 antspyx = ">=0.5.4, <1.0.0"
-scipy = "<1.14"
+scipy = "^1.14"
 
 
 # hd-bet reqs