diff --git a/EddyHigh_b_Test/EddyHigh_b_Feeds.py b/EddyHigh_b_Test/EddyHigh_b_Feeds.py index 588dfaf5a06cac3d95cc10e17a51846acd6512f9..57d40ae30e12ad53e5c9042e0c95d1e55bb0d7d7 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 5fe1589bb134c758a46a3a1cf7fc453fbe66cc3e..8c28442f7f739c13d40cd9f4161a800c7dfeb325 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 0c60e72d9cb2fca667318222f6bc36e949267fcf..53581de1233d43fcd1ffdb1182f308b24dc5e8ab 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 a51905b3d3bf458ef71069c08c558ebe231523a1..2ce809fad863e6c07ed8a05b5240d91aa31d56cf 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 f427bd1394ed85824ae95d9b6b272f15244fa7ce..dfe66a6c719fce958e35f45ffd4528bffa3f2b2e 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)