From 424a281bf2510667d667412a069314307c762ac7 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 3 Sep 2021 11:43:50 +0100
Subject: [PATCH] MNT: Use get_fdata instead of deprecated get_data
---
EddyHigh_b_Test/EddyHigh_b_Feeds.py | 8 ++++----
EddyLSRTest/EddyLSRFeeds.py | 8 ++++----
EddyMBSTest/MoveBySuscFeeds.py | 10 +++++-----
EddyS2VTest/S2VFeeds.py | 8 ++++----
EddyTest/EddyFeeds.py | 10 +++++-----
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/EddyHigh_b_Test/EddyHigh_b_Feeds.py b/EddyHigh_b_Test/EddyHigh_b_Feeds.py
index 588dfaf..57d40ae 100755
--- a/EddyHigh_b_Test/EddyHigh_b_Feeds.py
+++ b/EddyHigh_b_Test/EddyHigh_b_Feeds.py
@@ -31,10 +31,10 @@ class EddyHigh_b_FeedsType(object):
# Compare images and create statistics of differences
try:
- mask = self._mask.get_data().astype(float)
+ mask = self._mask.get_fdata()
mask = (mask > 0).astype(float)
- corrdiff = self._corr.get_data().astype(float)
- corrdiff = abs(corrdiff - self._precomp_corr.get_data().astype(float))
+ corrdiff = self._corr.get_fdata()
+ corrdiff = abs(corrdiff - self._precomp_corr.get_fdata())
self._corrdiffmeans = np.zeros(corrdiff.shape[3])
for vol in range(0, corrdiff.shape[3]):
@@ -131,4 +131,4 @@ def main(argv):
if __name__ == "__main__":
- main(sys.argv)
\ No newline at end of file
+ main(sys.argv)
diff --git a/EddyLSRTest/EddyLSRFeeds.py b/EddyLSRTest/EddyLSRFeeds.py
index 5fe1589..8c28442 100755
--- a/EddyLSRTest/EddyLSRFeeds.py
+++ b/EddyLSRTest/EddyLSRFeeds.py
@@ -30,10 +30,10 @@ class EddyLSRFeedsType(object):
# Compare images and create statistics of differences
try:
- mask = self._mask.get_data().astype(float)
+ mask = self._mask.get_fdata()
mask = (mask > 0).astype(float)
- corrdiff = self._corr.get_data().astype(float)
- corrdiff = abs(corrdiff - self._precomp_corr.get_data().astype(float))
+ corrdiff = self._corr.get_fdata()
+ corrdiff = abs(corrdiff - self._precomp_corr.get_fdata())
self._corrdiffmeans = np.zeros(corrdiff.shape[3])
for vol in range(0, corrdiff.shape[3]):
@@ -130,4 +130,4 @@ def main(argv):
if __name__ == "__main__":
- main(sys.argv)
\ No newline at end of file
+ main(sys.argv)
diff --git a/EddyMBSTest/MoveBySuscFeeds.py b/EddyMBSTest/MoveBySuscFeeds.py
index 0c60e72..53581de 100755
--- a/EddyMBSTest/MoveBySuscFeeds.py
+++ b/EddyMBSTest/MoveBySuscFeeds.py
@@ -34,12 +34,12 @@ class MoveBySuscFeedsType(object):
# Compare images and create statistics of differences
try:
- mask = self._mask.get_data().astype(float)
+ mask = self._mask.get_fdata()
mask = (mask > 0).astype(float)
- corrdiff = self._corr.get_data().astype(float)
- corrdiff = abs(corrdiff - self._precomp_corr.get_data().astype(float))
- fielddiff = self._deriv_fields.get_data().astype(float)
- fielddiff = abs(fielddiff - self._precomp_deriv_fields.get_data().astype(float))
+ corrdiff = self._corr.get_fdata()
+ corrdiff = abs(corrdiff - self._precomp_corr.get_fdata())
+ fielddiff = self._deriv_fields.get_fdata()
+ fielddiff = abs(fielddiff - self._precomp_deriv_fields.get_fdata())
self._corrdiffmeans = np.zeros(corrdiff.shape[3])
for vol in range(0, corrdiff.shape[3]):
diff --git a/EddyS2VTest/S2VFeeds.py b/EddyS2VTest/S2VFeeds.py
index a51905b..2ce809f 100755
--- a/EddyS2VTest/S2VFeeds.py
+++ b/EddyS2VTest/S2VFeeds.py
@@ -72,10 +72,10 @@ class S2VFeedsType(object):
# Compare images and create statistics of differences
try:
- mask = self._mask.get_data().astype(float)
+ mask = self._mask.get_fdata()
mask = (mask > 0).astype(float)
- corrdiff = self._corr.get_data().astype(float)
- corrdiff = abs(corrdiff - self._truth.get_data().astype(float))
+ corrdiff = self._corr.get_fdata()
+ corrdiff = abs(corrdiff - self._truth.get_fdata())
self._corrdiffmeans = [np.zeros(len(self._indicies[0])), np.zeros(len(self._indicies[1])), np.zeros(len(self._indicies[2]))]
for b in range(0,len(self._corrdiffmeans)):
@@ -378,4 +378,4 @@ def main(argv):
if __name__ == "__main__":
- main(sys.argv)
\ No newline at end of file
+ main(sys.argv)
diff --git a/EddyTest/EddyFeeds.py b/EddyTest/EddyFeeds.py
index f427bd1..dfe66a6 100755
--- a/EddyTest/EddyFeeds.py
+++ b/EddyTest/EddyFeeds.py
@@ -66,10 +66,10 @@ class EddyFeedsType(object):
# Compare images and create statistics of differences
try:
- mask = self._mask.get_data().astype(float)
+ mask = self._mask.get_fdata()
mask = (mask > 0).astype(float)
- corrdiff = self._corr.get_data().astype(float)
- corrdiff = abs(corrdiff - self._precomp_corr.get_data().astype(float))
+ corrdiff = self._corr.get_fdata()
+ corrdiff = abs(corrdiff - self._precomp_corr.get_fdata())
self._corrdiffmeans = np.zeros(corrdiff.shape[3])
for vol in range(0, corrdiff.shape[3]):
@@ -78,7 +78,7 @@ class EddyFeedsType(object):
self._fielddiffmeans = np.zeros(len(self._fields))
for vol in range(0,len(self._fields)):
- tmpdiff = self._fields[vol].get_data().astype(float) - self._precomp_fields[vol].get_data().astype(float)
+ tmpdiff = self._fields[vol].get_fdata() - self._precomp_fields[vol].get_fdata()
tmpdiff = np.square(tmpdiff[:,:,:,0]) + np.square(tmpdiff[:,:,:,1]) + np.square(tmpdiff[:,:,:,2])
tmpdiff = np.multiply(mask,np.sqrt(tmpdiff))
self._fielddiffmeans[vol] = np.array(mask.shape).prod() * tmpdiff.mean() / mask.sum()
@@ -275,4 +275,4 @@ def main(argv):
if __name__ == "__main__":
- main(sys.argv)
\ No newline at end of file
+ main(sys.argv)
--
GitLab