Skip to content
Snippets Groups Projects
Commit 424a281b authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

MNT: Use get_fdata instead of deprecated get_data

parent 28ad07f5
No related branches found
No related tags found
1 merge request!29Make eddy tests runnable in non-SGE environments
Pipeline #10733 passed
...@@ -31,10 +31,10 @@ class EddyHigh_b_FeedsType(object): ...@@ -31,10 +31,10 @@ class EddyHigh_b_FeedsType(object):
# Compare images and create statistics of differences # Compare images and create statistics of differences
try: try:
mask = self._mask.get_data().astype(float) mask = self._mask.get_fdata()
mask = (mask > 0).astype(float) mask = (mask > 0).astype(float)
corrdiff = self._corr.get_data().astype(float) corrdiff = self._corr.get_fdata()
corrdiff = abs(corrdiff - self._precomp_corr.get_data().astype(float)) corrdiff = abs(corrdiff - self._precomp_corr.get_fdata())
self._corrdiffmeans = np.zeros(corrdiff.shape[3]) self._corrdiffmeans = np.zeros(corrdiff.shape[3])
for vol in range(0, corrdiff.shape[3]): for vol in range(0, corrdiff.shape[3]):
...@@ -131,4 +131,4 @@ def main(argv): ...@@ -131,4 +131,4 @@ def main(argv):
if __name__ == "__main__": if __name__ == "__main__":
main(sys.argv) main(sys.argv)
\ No newline at end of file
...@@ -30,10 +30,10 @@ class EddyLSRFeedsType(object): ...@@ -30,10 +30,10 @@ class EddyLSRFeedsType(object):
# Compare images and create statistics of differences # Compare images and create statistics of differences
try: try:
mask = self._mask.get_data().astype(float) mask = self._mask.get_fdata()
mask = (mask > 0).astype(float) mask = (mask > 0).astype(float)
corrdiff = self._corr.get_data().astype(float) corrdiff = self._corr.get_fdata()
corrdiff = abs(corrdiff - self._precomp_corr.get_data().astype(float)) corrdiff = abs(corrdiff - self._precomp_corr.get_fdata())
self._corrdiffmeans = np.zeros(corrdiff.shape[3]) self._corrdiffmeans = np.zeros(corrdiff.shape[3])
for vol in range(0, corrdiff.shape[3]): for vol in range(0, corrdiff.shape[3]):
...@@ -130,4 +130,4 @@ def main(argv): ...@@ -130,4 +130,4 @@ def main(argv):
if __name__ == "__main__": if __name__ == "__main__":
main(sys.argv) main(sys.argv)
\ No newline at end of file
...@@ -34,12 +34,12 @@ class MoveBySuscFeedsType(object): ...@@ -34,12 +34,12 @@ class MoveBySuscFeedsType(object):
# Compare images and create statistics of differences # Compare images and create statistics of differences
try: try:
mask = self._mask.get_data().astype(float) mask = self._mask.get_fdata()
mask = (mask > 0).astype(float) mask = (mask > 0).astype(float)
corrdiff = self._corr.get_data().astype(float) corrdiff = self._corr.get_fdata()
corrdiff = abs(corrdiff - self._precomp_corr.get_data().astype(float)) corrdiff = abs(corrdiff - self._precomp_corr.get_fdata())
fielddiff = self._deriv_fields.get_data().astype(float) fielddiff = self._deriv_fields.get_fdata()
fielddiff = abs(fielddiff - self._precomp_deriv_fields.get_data().astype(float)) fielddiff = abs(fielddiff - self._precomp_deriv_fields.get_fdata())
self._corrdiffmeans = np.zeros(corrdiff.shape[3]) self._corrdiffmeans = np.zeros(corrdiff.shape[3])
for vol in range(0, corrdiff.shape[3]): for vol in range(0, corrdiff.shape[3]):
......
...@@ -72,10 +72,10 @@ class S2VFeedsType(object): ...@@ -72,10 +72,10 @@ class S2VFeedsType(object):
# Compare images and create statistics of differences # Compare images and create statistics of differences
try: try:
mask = self._mask.get_data().astype(float) mask = self._mask.get_fdata()
mask = (mask > 0).astype(float) mask = (mask > 0).astype(float)
corrdiff = self._corr.get_data().astype(float) corrdiff = self._corr.get_fdata()
corrdiff = abs(corrdiff - self._truth.get_data().astype(float)) 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]))] 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)): for b in range(0,len(self._corrdiffmeans)):
...@@ -378,4 +378,4 @@ def main(argv): ...@@ -378,4 +378,4 @@ def main(argv):
if __name__ == "__main__": if __name__ == "__main__":
main(sys.argv) main(sys.argv)
\ No newline at end of file
...@@ -66,10 +66,10 @@ class EddyFeedsType(object): ...@@ -66,10 +66,10 @@ class EddyFeedsType(object):
# Compare images and create statistics of differences # Compare images and create statistics of differences
try: try:
mask = self._mask.get_data().astype(float) mask = self._mask.get_fdata()
mask = (mask > 0).astype(float) mask = (mask > 0).astype(float)
corrdiff = self._corr.get_data().astype(float) corrdiff = self._corr.get_fdata()
corrdiff = abs(corrdiff - self._precomp_corr.get_data().astype(float)) corrdiff = abs(corrdiff - self._precomp_corr.get_fdata())
self._corrdiffmeans = np.zeros(corrdiff.shape[3]) self._corrdiffmeans = np.zeros(corrdiff.shape[3])
for vol in range(0, corrdiff.shape[3]): for vol in range(0, corrdiff.shape[3]):
...@@ -78,7 +78,7 @@ class EddyFeedsType(object): ...@@ -78,7 +78,7 @@ class EddyFeedsType(object):
self._fielddiffmeans = np.zeros(len(self._fields)) self._fielddiffmeans = np.zeros(len(self._fields))
for vol in range(0,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.square(tmpdiff[:,:,:,0]) + np.square(tmpdiff[:,:,:,1]) + np.square(tmpdiff[:,:,:,2])
tmpdiff = np.multiply(mask,np.sqrt(tmpdiff)) tmpdiff = np.multiply(mask,np.sqrt(tmpdiff))
self._fielddiffmeans[vol] = np.array(mask.shape).prod() * tmpdiff.mean() / mask.sum() self._fielddiffmeans[vol] = np.array(mask.shape).prod() * tmpdiff.mean() / mask.sum()
...@@ -275,4 +275,4 @@ def main(argv): ...@@ -275,4 +275,4 @@ def main(argv):
if __name__ == "__main__": if __name__ == "__main__":
main(sys.argv) main(sys.argv)
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment