From 6a0acc93129eec578e0148b52cdfbf6b635404df Mon Sep 17 00:00:00 2001
From: Martin Genet <martin.genet@polytechnique.edu>
Date: Tue, 4 Jun 2019 18:08:36 +0200
Subject: [PATCH] Use numpy.divide and numpy.multiply
---
downsample_images.py | 8 ++++----
generate_images.py | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/downsample_images.py b/downsample_images.py
index 162a27a..3e57dcb 100644
--- a/downsample_images.py
+++ b/downsample_images.py
@@ -55,15 +55,15 @@ def downsample_images(
images_npoints = numpy.prod(images_nvoxels)
mypy.my_print(verbose, "images_npoints = "+str(images_npoints))
- images_downsampled_nvoxels = numpy.array(images_nvoxels)/numpy.array(downsampling_factors)
+ images_downsampled_nvoxels = numpy.divide(images_nvoxels, downsampling_factors)
images_downsampled_nvoxels = numpy.ceil(images_downsampled_nvoxels)
images_downsampled_nvoxels = [int(n) for n in images_downsampled_nvoxels]
mypy.my_print(verbose, "images_downsampled_nvoxels = "+str(images_downsampled_nvoxels))
- downsampling_factors = list(numpy.array(images_nvoxels)/numpy.array(images_downsampled_nvoxels))
+ downsampling_factors = list(numpy.divide(images_nvoxels, images_downsampled_nvoxels))
mypy.my_print(verbose, "downsampling_factors = "+str(downsampling_factors))
downsampling_factor = numpy.prod(downsampling_factors)
mypy.my_print(verbose, "downsampling_factor = "+str(downsampling_factor))
- images_downsampled_delta = list(numpy.array(images_delta)*numpy.array(downsampling_factors))
+ images_downsampled_delta = list(numpy.multiply(images_delta, downsampling_factors))
# mypy.my_print(verbose, "images_downsampled_delta = "+str(images_downsampled_delta))
images_downsampled_npoints = numpy.prod(images_downsampled_nvoxels)
# mypy.my_print(verbose, "images_downsampled_npoints = "+str(images_downsampled_npoints))
@@ -160,7 +160,7 @@ def downsample_images(
mypy.my_print(verbose, "spacing_downsampled = "+str(spacing_downsampled))
image_downsampled.SetSpacing(spacing_downsampled)
- origin_downsampled = list(numpy.array(images_downsampled_delta)/2)
+ origin_downsampled = list(numpy.divide(images_downsampled_delta, 2))
origin_downsampled = origin_downsampled+[0.]*(3-images_ndim)
mypy.my_print(verbose, "origin_downsampled = "+str(origin_downsampled))
image_downsampled.SetOrigin(origin_downsampled)
diff --git a/generate_images.py b/generate_images.py
index 21c7de0..b9c8e7a 100644
--- a/generate_images.py
+++ b/generate_images.py
@@ -92,20 +92,20 @@ def generate_images(
image_upsampled = vtk.vtkImageData()
- n_voxels_upsampled = list(numpy.array(images["n_voxels"])*numpy.array(images["upsampling_factors"]))
+ n_voxels_upsampled = list(numpy.multiply(images["n_voxels"], images["upsampling_factors"]))
dimensions_upsampled = n_voxels_upsampled+[1]*(3-images["n_dim"])
mypy.my_print(verbose, "dimensions_upsampled = "+str(dimensions_upsampled))
image_upsampled.SetDimensions(dimensions_upsampled)
- delta = list(numpy.array(images["L"])/numpy.array(images["n_voxels"]))
- delta_upsampled = list(numpy.array(delta)/numpy.array(images["upsampling_factors"]))
+ delta = list(numpy.divide(images["L"], images["n_voxels"]))
+ delta_upsampled = list(numpy.divide(delta, images["upsampling_factors"]))
spacing_upsampled = delta_upsampled+[1.]*(3-images["n_dim"])
mypy.my_print(verbose, "spacing_upsampled = "+str(spacing_upsampled))
image_upsampled.SetSpacing(spacing_upsampled)
- origin_upsampled = list(numpy.array(delta_upsampled)/2)
+ origin_upsampled = list(numpy.divide(delta, 2))
origin_upsampled = origin_upsampled+[0.]*(3-images["n_dim"])
mypy.my_print(verbose, "origin_upsampled = "+str(origin_upsampled))
image_upsampled.SetOrigin(origin_upsampled)
--
GitLab