Matt's changes to use faster beam propagator

1 files changed, 23 insertions, 26 deletions

diff --git a/self_gbeam_propagation.m b/self_gbeam_propagation.m
index 807303c..10bcf05 100644
--- a/self_gbeam_propagation.m
+++ b/self_gbeam_propagation.m
@@ -1,4 +1,4 @@
-function [ output_args ] = self_gbeam_propagation( w0, x_lens, f, x0, lambda )
+function [ w, w_pos ] = self_gbeam_propagation( w0, x_lens, f, x0, lambda )
 %SELF_GBEAM_PROPAGATION Summary of this function goes here
 %   Detailed explanation goes here
 
@@ -14,31 +14,28 @@ for i = 1:n_lens
     w_pos(i+1) = x_lens(i) + s_new;
 end
 
-x_pos= x_lens;
-x(1)=w_pos(1);
-waist_prop(1)=w(1);
-
-x_temp=linspace(x0 ,x_pos(1));
-waist_prop=[waist_prop w(1)*sqrt(1+((x_temp-w_pos(1))/(pi*w(1)^2/lambda)).^2)];
-x=[x x_temp];
-
-for i=1:n_lens
-    if i == 3
-        break
-    end
-    x_temp=linspace(x_pos(i),x_pos(i+1));     
-    waist_prop=[waist_prop w(i)*sqrt(1+((x_temp-w_pos(i))/(pi*w(i)^2/lambda)).^2)];  
-    x=[x x_temp];
-end
-
-x_temp=linspace(x_pos(end),x_pos(end)+abs(f(end)));  
-waist_prop=[waist_prop w(end)*sqrt(1+((x_temp-w_pos(end))/(pi*w(end)^2/lambda)).^2)];
-x=[x x_temp];
-
-
-figure(1)
-plot(x,waist_prop,'r',x,-waist_prop,'r'); 
-
+% x_pos= x_lens;
+% x(1)=w_pos(1);
+% waist_prop(1)=w(1);
+% 
+% x_temp=linspace(x0 ,x_pos(1));
+% waist_prop=[waist_prop, w(1)*sqrt(1+((x_temp-w_pos(1))/(pi*w(1)^2/lambda)).^2)];
+% x=[x x_temp];
+% 
+% for i=1:n_lens
+%     x_temp=linspace(x_pos(i),x_pos(i+1));     
+%     waist_prop=[waist_prop, w(i)*sqrt(1+((x_temp-w_pos(i))/(pi*w(i)^2/lambda)).^2)];  
+%     x=[x x_temp];
+% end
+% 
+% x_temp=linspace(x_pos(end),x_pos(end)+abs(f(end)));  
+% waist_prop=[waist_prop, w(end)*sqrt(1+((x_temp-w_pos(end))/(pi*w(end)^2/lambda)).^2)];
+% x=[x x_temp];
+% 
+% 
+% figure(1)
+% plot(x,waist_prop,'r',x,-waist_prop,'r'); 
+%