Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 07c47a4d authored by Edward Andò's avatar Edward Andò
Browse files

preparing version 0.5.3.3

parent c21c64c7
Pipeline #54168 passed with stages
in 24 minutes and 56 seconds
This diff is collapsed.
......@@ -419,26 +419,26 @@ if mpiRank == boss or not mpi:
# TODO: maybe interesting to add crop to remove black edges due to applyPhi??
imagette1toCorrelate = imagette1def.copy()
if args.DEBUG:
import matplotlib.pyplot as plt
print("t before pixel search:\n", spam.deformation.decomposePhi(PhiField[label])['t'])
print("r before pixel search:\n", spam.deformation.decomposePhi(PhiField[label])['r'])
plt.subplot(1,5,1)
plt.title("ref label")
plt.imshow(maskette1[:,:,maskette1.shape[2]//2])
plt.subplot(1,5,2)
plt.title("ref image")
plt.imshow(imagette1[:,:,imagette1.shape[2]//2])
plt.subplot(1,5,3)
plt.title("ref image deformed (no disp)")
plt.imshow(imagette1def[:,:,imagette1def.shape[2]//2])
plt.subplot(1,5,4)
plt.title("ref image deformed (no disp) + mask")
plt.imshow(imagette1toCorrelate[:,:,imagette1toCorrelate.shape[2]//2])
plt.subplot(1,5,5)
plt.title("def image search range")
plt.imshow(imagette2[:,:,imagette2.shape[2]//2])
plt.show()
#if args.DEBUG:
#import matplotlib.pyplot as plt
#print("t before pixel search:\n", spam.deformation.decomposePhi(PhiField[label])['t'])
#print("r before pixel search:\n", spam.deformation.decomposePhi(PhiField[label])['r'])
#plt.subplot(1,5,1)
#plt.title("ref label")
#plt.imshow(maskette1[:,:,maskette1.shape[2]//2])
#plt.subplot(1,5,2)
#plt.title("ref image")
#plt.imshow(imagette1[:,:,imagette1.shape[2]//2])
#plt.subplot(1,5,3)
#plt.title("ref image deformed (no disp)")
#plt.imshow(imagette1def[:,:,imagette1def.shape[2]//2])
#plt.subplot(1,5,4)
#plt.title("ref image deformed (no disp) + mask")
#plt.imshow(imagette1toCorrelate[:,:,imagette1toCorrelate.shape[2]//2])
#plt.subplot(1,5,5)
#plt.title("def image search range")
#plt.imshow(imagette2[:,:,imagette2.shape[2]//2])
#plt.show()
pixelSearchReturns = spam.DIC.correlate.pixelSearch(imagette1toCorrelate,
imagette2,
......
......@@ -99,7 +99,7 @@ name = 'spam'
description = 'Software for the Practical Analysis of Materials'
long_description = readReadMe('README.rst')
long_description_content_type = 'text/x-rst'
version = '0.5.3.2'
version = '0.5.3.3'
author = 'SPAM authors'
author_email = 'edward.ando@3sr-grenoble.fr'
copyright = 'SPAM authors 2020'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment