diff --git a/+Simulator/@Beams/Beams.m b/+Simulator/@Beams/Beams.m index f9ddf59..7889f1d 100644 --- a/+Simulator/@Beams/Beams.m +++ b/+Simulator/@Beams/Beams.m @@ -4,9 +4,9 @@ classdef Beams < handle & matlab.mixin.Copyable BlueBeamDefault = struct('Alias', 'Blue', ... 'Power', 400e-3, ... - 'Detuning', -1.39*Helper.PhysicsConstants.BlueLinewidth, ... - 'Radius', 35e-3, ... - 'Waist', 16.67e-3, ... + 'Detuning', -1.64*Helper.PhysicsConstants.BlueLinewidth, ... + 'Radius', 17.5e-3, ... + 'Waist', 15e-3, ... 'WaveNumber',2*pi/Helper.PhysicsConstants.BlueWavelength, ... 'Linewidth', Helper.PhysicsConstants.BlueLinewidth, ... 'SaturationIntensity', 0.1 * (2 * pi^2 / 3) * ... @@ -15,10 +15,10 @@ classdef Beams < handle & matlab.mixin.Copyable Helper.PhysicsConstants.BlueLinewidth) / (Helper.PhysicsConstants.BlueWavelength)^3)); BlueSidebandBeamDefault = struct('Alias', 'BlueSideband', ... - 'Power', 200e-3, ... + 'Power', 400e-3, ... 'Detuning', -3*Helper.PhysicsConstants.BlueLinewidth, ... - 'Radius', 35e-3, ... - 'Waist', 16.67e-3, ... + 'Radius', 17.5e-3, ... + 'Waist', 15e-3, ... 'WaveNumber',2*pi/Helper.PhysicsConstants.BlueWavelength, ... 'Linewidth', Helper.PhysicsConstants.BlueLinewidth, ... 'SaturationIntensity', 0.1 * (2 * pi^2 / 3) * ... @@ -27,10 +27,10 @@ classdef Beams < handle & matlab.mixin.Copyable Helper.PhysicsConstants.BlueLinewidth) / (Helper.PhysicsConstants.BlueWavelength)^3)); PushBeamDefault = struct('Alias', 'Push', ... - 'Power', 10e-3 , ... - 'Detuning', 0*Helper.PhysicsConstants.RedLinewidth, ... + 'Power', 25e-3 , ... + 'Detuning', 104.2*Helper.PhysicsConstants.RedLinewidth, ... 'Radius', 1.2e-03, ... - 'Waist', 20.001e-3, ... + 'Waist', 1.0e-03, ... 'WaveNumber',2*pi/Helper.PhysicsConstants.RedWavelength, ... 'Linewidth', Helper.PhysicsConstants.RedLinewidth, ... 'SaturationIntensity', 0.1 * (2 * pi^2 / 3) * ... @@ -163,7 +163,7 @@ classdef Beams < handle & matlab.mixin.Copyable methods function ret = get.SaturationParameter(this) - ret = 0.1 * (4 * this.Power) / (pi*this.Waist^2 * this.SaturationIntensity); % two beams are reflected + ret = 0.1 * (8 * this.Power) / (pi*this.Waist^2 * this.SaturationIntensity); % two beams are reflected end end % - getters for dependent properties