Reanalysis for thesis (incl. plate scale change)

demonstration scripts/thesis_propagation_figures.py

@@ -1,6 +1,7 @@
 import numpy as np
 import sys
-sys.path.insert(0, '/Users/joost/Dropbox/Werk/PhD/Analyses/Python/Analytical/Fourier Optics')
+# sys.path.insert(0, '/Users/joost/Dropbox/Werk/PhD/Analyses/Python/Analytical/Fourier Optics')
+sys.path.insert(0, '/Users/joost/Dropbox/Werk/PhD/Documents/Published/FourierOptics GitHub release/')
 from fourierOptics import *
 import matplotlib.pyplot as plt
 from pdb import set_trace
@@ -18,7 +19,8 @@ if __name__ == '__main__':
 	confList = [ ( 1, [-0.4, 0.4, -0.4, 0.4], 	'02_fourier_ELT-IFP.pdf'),
 				 ( 2, [-50, 50, -50, 50], 		'03_fourier_ELT-COL.pdf'),
 				 ( 4, [-50, 50, -50, 50], 		'04_fourier_ELT-MCD-ADC-P2.pdf'),
-				 (-1, [-1.2, 1.2, -1.2, 1.2], 	'05_fourier_ELT-MCD-DET.pdf')]
+				 # (-1, [-1.2, 1.2, -1.2, 1.2], 	'05_fourier_ELT-MCD-DET.pdf')]
+				 (-1, [-1.2/2.669, 1.2/2.669, -1.2/2.669, 1.2/2.669], 	'05_fourier_ELT-MCD-DET.pdf')]
 
 
 	for i in range(len(confList)):
@@ -26,7 +28,7 @@ if __name__ == '__main__':
 		coordinates = confList[i][1]
 		savename = confList[i][2]
 		E, x, y = mcd.propagate(l=1.35e-3, surface=s, image_output=coordinates,
-								 zoom=False, show=False, save=savename)
+								 zoom=False, show=True, save=False)
 
 	Eout, x, y = mcd.propagate(l=1.35e-3, surface=0, zoom=False, show=False)
 	x /= 1e3 # convert to m
@@ -47,5 +49,5 @@ if __name__ == '__main__':
 	_ax2.set_ylabel('y [m]')
 	_fig.colorbar(_im2, ax=_ax2, label='Phase')
 	plt.tight_layout()
-	plt.savefig('01_fourier_ELT-M1.pdf', bbox_inches='tight', transparent=True)
+	# plt.savefig('01_fourier_ELT-M1.pdf', bbox_inches='tight', transparent=True)
 	plt.close()#show()