diff --git a/examples/gauss_param.py b/examples/gauss_param.py index a08e4629461a0a0de157c73ab76fffece96fa1cc..75acf384131a5b0e50e41883f8a22e2b31ddbe33 100644 --- a/examples/gauss_param.py +++ b/examples/gauss_param.py @@ -1,15 +1,15 @@ -from pykat.utilities.optics.ABCD import apply, mirror_trans -from pykat.utilities.optics.gaussian_beams import gauss_param - -nr1 = 1 -nr2 = 1.44963098985906 -q1 = gauss_param(q=5.96343 + 3.04713j) -abcd = mirror_trans(nr1, nr2, float("inf")) -# into material -q2 = apply(abcd, q1, nr1, nr2) -# and out again -q3 = apply(abcd, q2, nr2, nr1) - -print "q1 =", q1, " w0 =", q1.w0, " wz =", q1.wz, " z =", q1.z -print "q2 =", q2, " w0 =", q2.w0, " wz =", q2.wz, " z =", q2.z -print "q3 =", q3, " w0 =", q3.w0, " wz =", q3.wz, " z =", q3.z +from pykat.utilities.optics.ABCD import apply, mirror_trans +from pykat.utilities.optics.gaussian_beams import gauss_param + +nr1 = 1 +nr2 = 1.44963098985906 +q1 = gauss_param(q=5.96343 + 3.04713j) +abcd = mirror_trans(nr1, nr2, float("inf")) +# into material +q2 = apply(abcd, q1, nr1, nr2) +# and out again +q3 = apply(abcd, q2, nr2, nr1) + +print "q1 =", q1, " w0 =", q1.w0, " w =", q1.w, " z =", q1.z +print "q2 =", q2, " w0 =", q2.w0, " w =", q2.w, " z =", q2.z +print "q3 =", q3, " w0 =", q3.w0, " w =", q3.w, " z =", q3.z diff --git a/pykat/utilities/optics/gaussian_beams.py b/pykat/utilities/optics/gaussian_beams.py index 754135cfd694a9dd3165878d99f4434f229ff584..e7572042280aac28048a1d4fad448d964b38c0e3 100644 --- a/pykat/utilities/optics/gaussian_beams.py +++ b/pykat/utilities/optics/gaussian_beams.py @@ -68,7 +68,7 @@ class gauss_param(object): def zr(self): return self.__q.imag @property - def wz(self): + def w(self): return self.w0 * math.sqrt(1 + (self.__q.real/self.__q.imag)**2) @property @@ -188,4 +188,4 @@ class HG_gauss_beam(object): # need to finish... return self.__xpre_const - \ No newline at end of file +