Minor mods

This commit is contained in:
Karthik 2025-02-23 20:22:11 +01:00
parent f972dbe0e1
commit 1e5e41e042
2 changed files with 44 additions and 43 deletions

View File

@ -1,4 +1,4 @@
function [Positions, IdealTrappingPotential, TrappingPotential, TrapDepthsInKelvin, ExtractedTrapFrequencies] = computeTrapPotential(w_x, w_z, Power, options)
function [Positions, IdealTrappingPotential, TrappingPotential, TrapDepthsInKelvin, ExtractedTrapFrequencies] = computeTrapPotential(options)
alpha = options.Polarizability;
@ -10,6 +10,10 @@ function [Positions, IdealTrappingPotential, TrappingPotential, TrapDepthsInKelv
modulation = options.Modulation;
crossed = options.Crossed;
Power = options.Power;
w_x = options.w_x;
w_z = options.w_z;
% Apply modulation if necessary
if modulation
aspect_ratio = options.AspectRatio;

View File

@ -28,37 +28,32 @@ Dy164Mass = 163.929174751*AtomicMassUnit;
Dy164IsotopicAbundance = 0.2826;
DyMagneticMoment = 9.93*BohrMagneton;
% Parameters
Power = 40;
w_x = 30 * 1e-6; % Beam waist in X direction in meters
w_z = 30 * 1e-6; % Beam waist in Z direction in meters
%% Parameters
options = struct;
options.Axis = 3; % axis referenced to the beam along which you want the dipole trap potential
options.Extent = 1E2; % range of spatial coordinates in one direction to calculate trap potential over
options.Crossed = false; % angle between arms in degrees
options.Delta = 70;
options.Modulation = false; % required aspect ratio of modulated arm
options.ModulationFunction = 'arccos';
options.ModulationAmplitude = 2.16;
options.AspectRatio = 4;
options.Gravity = false;
options.TiltGravity = false;
options.Theta = 0.75; % gravity tilt angle in degrees
options.TiltAxis = [1, 0, 0]; % lab space coordinates are rotated about x-axis in reference frame of beam
options.Astigmatism = false;
options.DisplacementFoci = 2.5 * 1e-3; % difference in position of the foci along the propagation direction in meters
options.ExtractTrapFrequencies = false;
options.Mass = Dy164Mass;
options.MagneticMoment = DyMagneticMoment;
options.Power = 40;
options.w_x = 30 * 1e-6; % Beam waist in X direction in meters
options.w_z = 30 * 1e-6; % Beam waist in Z direction in meters
options.Polarizability = 180;
options.Wavelength = 532E-9;
options.Wavelength = 1064E-9;
% Initialize variables
@ -66,7 +61,9 @@ ComputedPotentials = {};
Params = {};
% Call the function to compute trap potential
[Positions, IdealTrappingPotential, TrappingPotential, TrapDepthsInKelvin, ExtractedTrapFrequencies] = Calculator.computeTrapPotential(w_x, w_z, Power, options);
[Positions, IdealTrappingPotential, ...
TrappingPotential, TrapDepthsInKelvin, ...
ExtractedTrapFrequencies] = Calculator.computeTrapPotential(options);
% Store computed potentials and parameters
ComputedPotentials{end+1} = IdealTrappingPotential;