updated with more recent parameters

1 files changed, 17 insertions, 13 deletions

diff --git a/cavity_design_demo.m b/cavity_design_demo.m
index 066b267..ccc96c1 100644
--- a/cavity_design_demo.m
+++ b/cavity_design_demo.m
@@ -14,11 +14,15 @@
 % dm is part of d2
 
 % let's set some parameters
-f1=0.4;
-f2=Inf;
-d1=.105;
-d2=.79-d1;
-Ltot = d1+d2; % total resonator length
+f1=0.30;
+d1=.105; % with respect to the flat front mirror
+% we use single lens design
+f2=Inf; % dummy lens
+Lcav = 0.79; % geometrical pathlength of the cavity
+n_refr = 1.5; % PBS index of reffraction
+% we need to add to geometrical path extra optical path due to two PBS 0.5" each
+Lcav = Lcav + 2 * 0.025/2 * (n_refr-1) ;
+d2=Lcav-d1; %distance between lens1 and lens2
 
 % time to build the optics set
 mirror1.abcd = abcd_lens( f1 ) ;
@@ -48,7 +52,7 @@ display('Cavity is stable');
 zstart = 0;
 qstart = abcd2self_repeating_q( abcd_cavity );
 
-zfinal = Ltot;
+zfinal = Lcav;
 qfinal = q_after_abcd( qstart, abcd_cavity );
 
 
@@ -75,17 +79,17 @@ display_prop = [show_lens_width, show_lens_position];
 waist_at_mirrors
 
 display('Presumed size and location of the cavity waist');
-[w0, z0] = cavity_optics2its_waist_and_position( optics, lambda )
+[wc, zc] = cavity_optics2its_waist_and_position( optics, lambda )
 
-q0_via_propagation = gbeam_propagation ( z0, qstart, zstart, optics );
-[w0prop, R0prop] = q2wr(q0_via_propagation, lambda);
+qc_via_propagation = gbeam_propagation ( zc, qstart, zstart, optics );
+[wcprop, Rcprop] = q2wr(qc_via_propagation, lambda);
 
-% we expect R0prop to be infinite since it is focused point
-% w0prop should match w0
+% we expect Rcprop to be infinite since it is focused point
+% wcprop should match wc
 
-if ( abs( w0 - w0prop ) > eps )
+if ( abs( wc - wcprop ) > eps )
     % We should never be here if above functions do their job correctly
-    display(w0prop);
+    display(wcprop);
     error('Different methods to calculate focused point parameters do not match');
 end