From 0238e5d312a67740d9f4e5e6a4bafa7fb2950915 Mon Sep 17 00:00:00 2001 From: Karthik Chandrashekara Date: Fri, 16 Jul 2021 15:49:02 +0200 Subject: [PATCH] Added option to switch between Bootstrap and Jackknife error estimation methods, changed sideband beam flag name, removed zeeman slower beam flag which can be added later following development of the ThreeDimensionalMOT class and functionalities. --- +Simulator/@MOTCaptureProcess/MOTCaptureProcess.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/+Simulator/@MOTCaptureProcess/MOTCaptureProcess.m b/+Simulator/@MOTCaptureProcess/MOTCaptureProcess.m index 86d1e26..c7af89d 100644 --- a/+Simulator/@MOTCaptureProcess/MOTCaptureProcess.m +++ b/+Simulator/@MOTCaptureProcess/MOTCaptureProcess.m @@ -5,12 +5,12 @@ classdef MOTCaptureProcess < handle & matlab.mixin.Copyable TimeStep; SimulationTime; NumberOfAtoms; + ErrorEstimationMethod; %Flags SpontaneousEmission; - Sideband; + SidebandBeam; PushBeam; - ZeemanSlowerBeam; Gravity; BackgroundCollision; @@ -34,6 +34,8 @@ classdef MOTCaptureProcess < handle & matlab.mixin.Copyable p.KeepUnmatched = true; addParameter(p, 'SimulationMode', '2D',... @(x) any(strcmpi(x,{'2D','3D', 'Full'}))); + addParameter(p, 'ErrorEstimationMethod', 'jackknife',... + @(x) any(strcmpi(x,{'jackknife','bootstrap'}))); addParameter(p, 'NumberOfAtoms', 5000,... @(x) assert(isnumeric(x) && isscalar(x) && (x > 0))); addParameter(p, 'TimeStep', 10e-06,... @@ -42,12 +44,10 @@ classdef MOTCaptureProcess < handle & matlab.mixin.Copyable @(x) assert(isnumeric(x) && isscalar(x) && (x > 0))); addParameter(p, 'SpontaneousEmission', false,... @islogical); - addParameter(p, 'Sideband', false,... + addParameter(p, 'SidebandBeam', false,... @islogical); addParameter(p, 'PushBeam', false,... @islogical); - addParameter(p, 'ZeemanSlowerBeam', false,... - @islogical); addParameter(p, 'Gravity', false,... @islogical); addParameter(p, 'BackgroundCollision', false,... @@ -62,15 +62,15 @@ classdef MOTCaptureProcess < handle & matlab.mixin.Copyable p.parse(varargin{:}); this.SimulationMode = p.Results.SimulationMode; + this.ErrorEstimationMethod= p.Results.ErrorEstimationMethod; this.NumberOfAtoms = p.Results.NumberOfAtoms; this.TimeStep = p.Results.TimeStep; this.SimulationTime = p.Results.SimulationTime; this.SpontaneousEmission = p.Results.SpontaneousEmission; - this.Sideband = p.Results.Sideband; + this.SidebandBeam = p.Results.SidebandBeam; this.PushBeam = p.Results.PushBeam; - this.ZeemanSlowerBeam = p.Results.ZeemanSlowerBeam; this.Gravity = p.Results.Gravity; this.BackgroundCollision = p.Results.BackgroundCollision;