calculated start/end waist to their coupler and first mirror positions

1 files changed, 13 insertions, 5 deletions

diff --git a/mode_match_demo.m b/mode_match_demo.m
index 8ddf290..2386552 100644
--- a/mode_match_demo.m
+++ b/mode_match_demo.m
@@ -1,28 +1,36 @@
 %Permute all possible lens combinations out of set of lenses
-lens_set = [.075, .203]; %Given lenses of unique focal lengths
+lens_set = [0.025, 0.035, 0.05, .075, 0.10, .125, 0.20, 0.50, 0.75, -.05, -0.10 ]; %Given lenses of unique focal lengths
 lens_permutations = pick(lens_set,3,'or'); %3 lens solutions
 
 %Pre-defined Constants
 lambda= .795e-6 ; %Wavelength of beam
-Ltot= 1.54+.51+.4813 ; %Length of optical system
+Ltot= .51 ; %Length of optical system
 r0= 1.0E+100 ; %Initial radius of curvature
 w0= 5.65e-4 ; %Initial waist
+
+dummy_lens.abcd = abcd_lens(inf);
+dummy_lens.x = 10000;
+dummy_optic = {dummy_lens};
+q0 =  gbeam_propagation ( 0, wr2q(w0, r0, lambda), -1.54, dummy_optic );
+
 x0= 0 ; %Starting position of beam
 wf= 2.6983e-4 ; %Desired final waist
 rf= 1.0E+100 ; %Desired final radius
+qf =  gbeam_propagation ( 0, wr2q(wf, rf, lambda), -0.4813, dummy_optic );
+
 lens_width = .03; %Lens width
 show_lens_width = 1; %Set to 1 to enable display of lens width on solution propagation plot
 show_lens_position = 1; %Set to 1 to enable display of position of center of lens on solution propagation plot
 display_prop = [show_lens_width, show_lens_position];
 n_truncate = 3; %number of digits in truncated solution
-n_visualizations = 2; %number of best solutions to visualize
+n_visualizations = 5; %number of best solutions to visualize
 n_hist = 1000; %number of sample points in histogram
 stability_max = 1; %max stability (y-axis) shown on energy vs. stability graph
 self_flag = 0; %Set to 1 to use Self's gaussian beam propagation, otherwise set to 0
 %End list
 
-q0=wr2q(w0,r0,lambda); %Calculate intial q
-qf=wr2q(wf,rf,lambda); %Calculate final q
+%q0=wr2q(w0,r0,lambda); %Calculate intial q
+%qf=wr2q(wf,rf,lambda); %Calculate final q
 
 %Mode match
 [ possible_lens_placement, initial_lens_placement, possible_lens_set, possible_sample_energy] = mode_match( q0, qf, Ltot, lambda, lens_permutations, lens_width, self_flag );