From 5abd195108662f4ea956d4a060c7087d46fa160e Mon Sep 17 00:00:00 2001
From: Jonathan Peltier
Date: Thu, 3 Dec 2020 23:44:32 +0100
Subject: [PATCH] v1.1 Allow multiple waveguides
This update allow to add, delete waveguides like it was already possible with beams.
---
beampy/__init__.py | 2 +-
beampy/bpm.py | 214 ++--
beampy/interface.py | 266 ++---
beampy/interface.ui | 1068 ++++++++++---------
beampy/user_interface.py | 597 +++++++----
docs/html/.buildinfo | 2 +-
docs/html/.doctrees/beampy.doctree | Bin 267616 -> 282796 bytes
docs/html/.doctrees/codes.doctree | Bin 379462 -> 403371 bytes
docs/html/.doctrees/environment.pickle | Bin 34476 -> 35214 bytes
docs/html/.doctrees/index.doctree | Bin 17174 -> 17174 bytes
docs/html/LICENSE.html | 2 +-
docs/html/_static/documentation_options.js | 2 +-
docs/html/beampy.html | 130 ++-
docs/html/codes.html | 1079 ++++++++++++--------
docs/html/contact.html | 2 +-
docs/html/examples.html | 2 +-
docs/html/genindex.html | 19 +-
docs/html/index.html | 4 +-
docs/html/interface.html | 2 +-
docs/html/objects.inv | Bin 929 -> 937 bytes
docs/html/py-modindex.html | 2 +-
docs/html/results.html | 2 +-
docs/html/search.html | 2 +-
docs/html/searchindex.js | 2 +-
24 files changed, 2009 insertions(+), 1390 deletions(-)
diff --git a/beampy/__init__.py b/beampy/__init__.py
index 9a2383a..c5a6f14 100644
--- a/beampy/__init__.py
+++ b/beampy/__init__.py
@@ -29,7 +29,7 @@
# module
from beampy import examples
-__version__ = "1.0"
+__version__ = "1.1"
def help():
diff --git a/beampy/bpm.py b/beampy/bpm.py
index e98baea..03ce481 100644
--- a/beampy/bpm.py
+++ b/beampy/bpm.py
@@ -43,12 +43,8 @@ class Bpm():
Parameters
----------
- width : float
- Guide width defined as the diameter (µm) at 1/e^2 intensity.
no : float
Refractive index of the cladding.
- delta_no : float
- Difference of refractive index between the core and the cladding.
length_z : float
Size of the compute window over z (µm).
dist_z : float
@@ -61,7 +57,7 @@ class Bpm():
Step over x (µm)
"""
- def __init__(self, width, no, delta_no,
+ def __init__(self, no,
length_z, dist_z, nbr_z_disp,
length_x, dist_x):
"""
@@ -72,12 +68,8 @@ def __init__(self, width, no, delta_no,
Parameters
----------
- width : float
- Guide width defined as the diameter (µm) at 1/e^2 intensity.
no : float
Refractive index of the cladding
- delta_no : float
- Difference of refractive index between the core and the cladding.
length_z : float
Size of the compute window over z (µm).
dist_z : float
@@ -89,19 +81,13 @@ def __init__(self, width, no, delta_no,
dist_x : float
Step over x (µm).
"""
- self.width = width
self.no = no
- self.delta_no = delta_no
self.length_z = length_z
self.dist_z = dist_z
self.nbr_z_disp = nbr_z_disp
self.dist_x = dist_x
self.length_x = length_x
- if delta_no > no/10:
- print("Careful: index variation is too high:")
- print(delta_no, ">", no, "/ 10")
-
def create_x_z(self):
"""
Create the x, z array and ajust the resolution variables.
@@ -160,20 +146,25 @@ def create_x_z(self):
# Guides #
- def squared_guide(self):
+ def squared_guide(self, width):
"""
A lambda function than returns a centered rectangular shape.
return 1 if :math:`x >= -width/2` and :math:`x <= width/2`
else return 0.
+ Parameters
+ ----------
+ width : float
+ Guide width defined as the diameter (µm) at 1/e^2 intensity.
+
Notes
-----
This methods uses the width variable defined in :class:`Bpm`.
"""
- return lambda t: (t >= -self.width/2) & (t <= self.width/2)
+ return lambda t: (t >= -width/2) & (t <= width/2)
- def gauss_guide(self, gauss_pow):
+ def gauss_guide(self, width, gauss_pow=1):
"""
A lambda function than return a centered super-Gaussian shape.
@@ -186,23 +177,22 @@ def gauss_guide(self, gauss_pow):
Parameters
----------
- gauss_pow : int
+ width : float
+ Guide width defined as the diameter (µm) at 1/e^2 intensity.
+ gauss_pow : int, optional
Index of the super-gaussian guide with 1 being a regural gaussian
guide and 4 being the conventionnal super-gaussian guide used to
- describe realistic guides.
+ describe realistic waveguides.
See on en.wikipedia.org/wiki/Gaussian_function
- #Higher-order_Gaussian_or_super-Gaussian_function
-
- Notes
- -----
- This methods uses the width variable defined in :class:`Bpm`.
+ #Higher-order_Gaussian_or_super-Gaussian_function.
+ 1 by Default.
"""
- if self.width == 0:
+ if width == 0:
return lambda t: 0
- w = self.width / 2 # want diameter at 1/e =width so 2*w=witdh
+ w = width / 2 # want diameter at 1/e =width so 2*w=width
return lambda t: np.exp(-(t / w)**(2*gauss_pow))
- def create_guides(self, shape, nbr_p, p, offset_guide=0):
+ def create_guides(self, shape, delta_no, nbr_p, p, offset_guide=0, z=0):
"""
Create an array of guides over x using peaks positions and for a given
shape.
@@ -213,6 +203,8 @@ def create_guides(self, shape, nbr_p, p, offset_guide=0):
:meth:`squared_guide`, :meth:`gauss_guide` or any lambda function
that takes one argument and return the relative refractive index
for the input position.
+ delta_no : float
+ Difference of refractive index between the core and the cladding.
nbr_p : int
Number of guides.
p : float
@@ -230,10 +222,10 @@ def create_guides(self, shape, nbr_p, p, offset_guide=0):
Notes
-----
This methods uses the following variables defined in :class:`Bpm`:
- nbr_z, nbr_x, x, dist_x, delta_no.
+ nbr_z, nbr_x, x, dist_x.
"""
- self.peaks = np.zeros((nbr_p, self.nbr_z))
- self.dn = np.zeros((self.nbr_z, self.nbr_x))
+ peaks = np.zeros((nbr_p, self.nbr_z))
+ dn = np.zeros((self.nbr_z, self.nbr_x))
dn_z = np.zeros(self.nbr_x)
peaks_z = (p*np.linspace(-nbr_p/2, nbr_p/2-1, nbr_p)
@@ -246,14 +238,15 @@ def create_guides(self, shape, nbr_p, p, offset_guide=0):
dn_z += np.roll(dn_fix, int(round(peaks_z[i] / self.dist_x)))
# only necessary because this program can have curved guides
+ # TODO: implement z start end
+ dn[:] = dn_z
for i in range(self.nbr_z):
- self.dn[i, :] = dn_z
- self.peaks[:, i] = peaks_z
+ peaks[:, i] = peaks_z
- self.dn = self.dn * self.delta_no # give a value to the shape
- return [self.peaks, self.dn]
+ dn = dn * delta_no # give a value to the shape
+ return [peaks, dn]
- def create_curved_guides(self, shape, curve, half_delay,
+ def create_curved_guides(self, shape, width, delta_no, curve, half_delay,
distance_factor, offset_guide=0):
"""
Create two curved guides and one linear guide on the center (STIRAP).
@@ -270,6 +263,10 @@ def create_curved_guides(self, shape, curve, half_delay,
----------
shape : method
:meth:`square` or :meth:`gauss`
+ width : float
+ Guide width defined as the diameter (µm) at 1/e^2 intensity.
+ delta_no : float
+ Difference of refractive index between the core and the cladding.
curve : float
curvature factor in :math:`10^{-8} µm^{-2}`.
half_delay : float
@@ -295,7 +292,7 @@ def create_curved_guides(self, shape, curve, half_delay,
Notes
-----
This methods uses the following variables defined in :class:`Bpm`:
- length_z, nbr_z, width, nbr_x, x, dist_x, delta_no.
+ length_z, nbr_z, width, nbr_x, x, dist_x.
"""
# all points over z
z = np.linspace(0, self.length_z, self.nbr_z)
@@ -303,27 +300,27 @@ def create_curved_guides(self, shape, curve, half_delay,
# left curved guide
sa = (- offset_guide
+ curve*(z - self.length_z/2 - half_delay)**2
- + self.width*distance_factor)
+ + width*distance_factor)
# right curved guide
sb = (offset_guide
+ curve*(z - self.length_z/2 + half_delay)**2
- + self.width*distance_factor)
+ + width*distance_factor)
- self.peaks = np.array([-sa,
- np.array([offset_guide] * self.nbr_z),
- sb])
+ peaks = np.array([-sa,
+ np.array([offset_guide] * self.nbr_z),
+ sb])
- self.dn = np.zeros((self.nbr_z, self.nbr_x))
+ dn = np.zeros((self.nbr_z, self.nbr_x))
dn_fix = shape(self.x) # guide shape center on 0
for i in range(self.nbr_z):
- self.dn[i, :] = np.roll(dn_fix, int(round(-sa[i] / self.dist_x))) \
+ dn[i, :] = np.roll(dn_fix, int(round(-sa[i] / self.dist_x))) \
+ np.roll(dn_fix, int(round(offset_guide / self.dist_x))) \
+ np.roll(dn_fix, int(round(sb[i] / self.dist_x)))
- self.dn = self.dn * self.delta_no # give a value to the shape
- return [self.peaks, self.dn]
+ dn = dn * delta_no # give a value to the shape
+ return [peaks, dn]
# Light #
@@ -384,8 +381,7 @@ def squared_light(self, fwhm, offset_light=0):
field = np.zeros(self.nbr_x)
for j in range(self.nbr_x):
- if (self.x[j] >= -fwhm/2
- and self.x[j] <= fwhm/2):
+ if self.x[j] >= -fwhm/2 and self.x[j] <= fwhm/2:
field[j] = 1
else:
field[j] = 0
@@ -393,13 +389,17 @@ def squared_light(self, fwhm, offset_light=0):
field = np.roll(field, int(round(offset_light / self.dist_x)))
return field
- def mode_determ(self, mode):
+ def mode_determ(self, width, delta_no, mode):
"""
Solve the transcendental equation tan=sqrt that give the modes
allowed in a squared guide.
Parameters
----------
+ width : float
+ Guide width defined as the diameter (µm) at 1/e^2 intensity.
+ delta_no : float
+ Difference of refractive index between the core and the cladding.
mode : int
Number of the searched mode.
@@ -420,16 +420,18 @@ def mode_determ(self, mode):
Notes
-----
This methods uses the following variables defined in :class:`Bpm`:
- lo, width, no, delta_no, ko.
+ lo, no, ko.
"""
- lim = self.lo/(2 * self.width * (self.no + self.delta_no)) - 1e-12
- theta_c = acos(self.no / (self.no + self.delta_no)) # Critical angle
+ width = float(width)
+ delta_no = float(delta_no)
+ lim = self.lo/(2 * width * (self.no + delta_no)) - 1e-12
+ theta_c = acos(self.no / (self.no + delta_no)) # Critical angle
solu = np.linspace(
mode*lim + 0.000001,
(mode + 1) * lim,
round(1 + (lim - 0.000001)/0.000001))
lhs = np.tan(
- pi * self.width * (self.no + self.delta_no) / self.lo * solu
+ pi * width * (self.no + delta_no) / self.lo * solu
- mode*pi/2)
rhs = np.sqrt(
0j # to avoid sqrt error when complexe
@@ -445,19 +447,23 @@ def mode_determ(self, mode):
sin_theta_m = solu[i_min]
theta_m = asin(sin_theta_m) # angle at which the mode propagate
- beta_m = self.ko * (self.no + self.delta_no) * cos(theta_m)
- h_m = sqrt((self.ko * (self.no + self.delta_no))**2 - beta_m**2)
+ beta_m = self.ko * (self.no + delta_no) * cos(theta_m)
+ h_m = sqrt((self.ko * (self.no + delta_no))**2 - beta_m**2)
gamma_m = (self.no * self.ko
* np.sqrt((cos(theta_m) / cos(theta_c))**2 - 1))
return [h_m, gamma_m, beta_m]
- def mode_light(self, mode, lo, offset_light=0):
+ def mode_light(self, width, delta_no, mode, lo, offset_light=0):
"""
Create light based on propagated mode inside a squared guide.
Parameters
----------
+ width : float
+ Guide width defined as the diameter (µm) at 1/e^2 intensity.
+ delta_no : float
+ Difference of refractive index between the core and the cladding.
mode : int
Number of the searched mode.
lo : float
@@ -479,7 +485,7 @@ def mode_light(self, mode, lo, offset_light=0):
Notes
-----
This methods uses the following variables defined in :class:`Bpm`:
- nbr_x, width, x and the :meth`mode_determ` method.
+ nbr_x, x and the :meth`mode_determ` method.
This method create the following variables in :class:`Bpm`:
lo, ko.
@@ -488,50 +494,52 @@ def mode_light(self, mode, lo, offset_light=0):
self.ko = 2 * pi / self.lo # linear wave vector in free space (1/µm)
field = np.zeros(self.nbr_x)
- [h_m, gamma_m, beta_m] = self.mode_determ(mode)
+ [h_m, gamma_m, beta_m] = self.mode_determ(width, delta_no, mode)
if mode % 2 == 0: # if even mode
- b_b = cos(h_m * self.width / 2) # Continuity value where x=width/2
+ b_b = cos(h_m * width / 2) # Continuity value where x=width/2
for j in range(self.nbr_x): # Compute light based on h,gamma,beta
- if abs(self.x[j]) <= self.width/2: # in core
+ if abs(self.x[j]) <= width/2: # in core
field[j] = cos(h_m * self.x[j])
else: # in cladding
field[j] = b_b * exp(-gamma_m * (
abs(self.x[j])
- - self.width/2))
+ - width/2))
else: # if odd mode
- c_c = sin(h_m * self.width / 2) # Continuity value where x=width/2
+ c_c = sin(h_m * width / 2) # Continuity value where x=width/2
for j in range(self.nbr_x): # Compute light based on h,gamma,beta
- if abs(self.x[j]) <= self.width/2: # in core
+ if abs(self.x[j]) <= width/2: # in core
field[j] = sin(h_m * self.x[j])
- elif self.x[j] >= self.width/2: # Right cladding
+ elif self.x[j] >= width/2: # Right cladding
field[j] = c_c * exp(-gamma_m * (
self.x[j]
- - self.width/2))
+ - width/2))
else: # Left cladding
field[j] = -c_c * exp(gamma_m * (
self.x[j]
- + self.width/2))
+ + width/2))
field = np.roll(field, int(round(offset_light / self.dist_x)))
return [field, h_m, gamma_m, beta_m]
- def all_modes(self, lo, offset_light=0):
+ def all_modes(self, width, delta_no, lo, offset_light=0):
"""
Compute all modes allowed by the guide and sum them into one field.
Parameters
----------
+ width : float
+ Guide width defined as the diameter (µm) at 1/e^2 intensity.
lo : float
Wavelength of the beam in vaccum in µm.
offset_light : float, optional
@@ -562,7 +570,7 @@ def all_modes(self, lo, offset_light=0):
while True:
try:
[field_i, h_m, gamma_m, beta_m] = self.mode_light(
- i, lo, offset_light)
+ width, delta_no, i, lo, offset_light)
field = field + field_i
h = np.append(h, h_m)
gamma = np.append(gamma, gamma_m)
@@ -573,7 +581,7 @@ def all_modes(self, lo, offset_light=0):
return [field, h, gamma, beta]
- def check_modes(self, lo):
+ def check_modes(self, width, delta_no, lo):
"""
Return the last possible mode number.
Could be merged with :meth:`all_modes` but would increase the needed
@@ -581,6 +589,8 @@ def check_modes(self, lo):
Parameters
----------
+ width : float
+ Guide width defined as the diameter (µm) at 1/e^2 intensity.
lo : float
Wavelength of the beam in vaccum (µm).
@@ -597,7 +607,7 @@ def check_modes(self, lo):
while True:
try:
- self.mode_light(i, lo)
+ self.mode_light(width, delta_no, i, lo)
i += 1
except ValueError:
print("This guide can propagate up to the modes", i-1)
@@ -688,7 +698,7 @@ def airy_light(self, lobe_size, airy_zero, offset_light=0):
return [field, airy_zero]
- def init_field(self, field, theta_ext, irrad, lo):
+ def init_field(self, dn, field, theta_ext, irrad, lo):
"""
Initialize phase, field and power variables.
@@ -767,7 +777,7 @@ def init_field(self, field, theta_ext, irrad, lo):
self.phase_mat = fftshift(np.exp(-1j * self.dist_z / 2 * fr))
# Refractive index modulation
- self.nl_mat = self.ko * self.dist_z * self.dn
+ self.nl_mat = self.ko * self.dist_z * dn
# Initial irradiance
self.current_power = self.epnc * (
@@ -778,7 +788,7 @@ def init_field(self, field, theta_ext, irrad, lo):
return [self.progress_pow]
- def guide_position(self, guide, size):
+ def guide_position(self, peaks, guide, size):
"""
Return the left and right position index over x of a given guide
for each z.
@@ -805,11 +815,11 @@ def guide_position(self, guide, size):
x_beg = np.zeros(self.nbr_z, dtype=int) # Note: don't use x_end=x_beg
x_end = np.zeros(self.nbr_z, dtype=int) # Because id would be ==
- if self.peaks.shape[0] != 0:
+ if peaks.shape[0] != 0:
for j in range(self.nbr_z):
- pos_beg = (self.peaks[guide, j] - size/2) # Left position
+ pos_beg = (peaks[guide, j] - size/2) # Left position
# If the position is out of boundery, change interval to
# (-length_x/2, length_x)
@@ -824,7 +834,7 @@ def guide_position(self, guide, size):
# Search the closest index value for this position
x_beg[j] = np.where(self.x >= pos_beg)[0][0]
- pos_end = (self.peaks[guide, j] + size/2)
+ pos_end = (peaks[guide, j] + size/2)
if pos_end < self.x[0] or pos_end > self.x[-1]:
pos_end = pos_end % self.length_x
@@ -872,7 +882,7 @@ def power_guide(self, x_beg, x_end):
P /= np.trapz(self.progress_pow[0, ], axis=0)
return P
- def losses_position(self, guide_lost, width_lost):
+ def losses_position(self, peaks, guide_lost, width_lost):
"""
Return the left and right position (x) index of a given area
over z [x,z].
@@ -902,11 +912,11 @@ def losses_position(self, guide_lost, width_lost):
lost_end = np.zeros((self.nbr_z, self.nbr_lost), dtype=int)
for j, n in enumerate(guide_lost):
[lost_beg[:, j],
- lost_end[:, j]] = self.guide_position(n, width_lost[j])
+ lost_end[:, j]] = self.guide_position(peaks, n, width_lost[j])
return [lost_beg, lost_end]
- def kerr_effect(self, chi3=1e-19, kerr_loop=1, variance_check=False,
+ def kerr_effect(self, dn, chi3=1e-19, kerr_loop=1, variance_check=False,
field_start=None, dn_start=None, phase_mat=None):
"""
Kerr effect: refractive index modulation by the light intensity.
@@ -948,7 +958,7 @@ def kerr_effect(self, chi3=1e-19, kerr_loop=1, variance_check=False,
i, epnc, no, ko, dist_z and the :meth:`variance` method.
"""
# Set the default value if none were given
- dn_start = self.dn[self.i, :] if dn_start is None else dn_start
+ dn_start = dn[self.i, :] if dn_start is None else dn_start
nl_mat = self.ko * self.dist_z * dn_start
field_start = self.field if field_start is None else field_start
phase_mat = self.phase_mat if phase_mat is None else phase_mat
@@ -1046,27 +1056,25 @@ def absorption(self, alpha, lost_beg, lost_end):
This methods uses the following variables defined in :class:`Bpm`:
nbr_lost, i, field, dist_z, nbr_x.
"""
+ # TODO: implement nbr_lost into the interface
for n in range(self.nbr_lost):
if lost_beg[self.i, n] <= lost_end[self.i, n]: # Normal case
-
- for j in range(lost_beg[self.i, n], lost_end[self.i, n]+1):
- self.field[j] *= exp(-alpha * self.dist_z)
+ a, b = lost_beg[self.i, n], lost_end[self.i, n]+1
+ self.field[a:b] *= exp(-alpha*self.dist_z)
else: # Take into account guide crossing the window edges
+ a, b = lost_beg[self.i, n], self.nbr_x
+ self.field[a:b] *= exp(-alpha*self.dist_z)
- for j in range(lost_beg[self.i, n], self.nbr_x):
- self.field[j] *= exp(-alpha * self.dist_z)
-
- for j in range(0, lost_end[self.i, n]+1):
- self.field[j] *= exp(-alpha * self.dist_z)
+ a, b = 0, lost_end[self.i, n]+1
+ self.field[a:b] *= exp(-alpha*self.dist_z)
return self.field
- def bpm_compute(self, chi3=1e-19, kerr=False, kerr_loop=1,
+ def bpm_compute(self, dn, chi3=1e-19, kerr=False, kerr_loop=1,
variance_check=False,
alpha=0, lost_beg=None, lost_end=None):
-
"""
Compute BPM principle : free_propag over dz/2, index modulation,
free_propag over dz/2.
@@ -1112,9 +1120,10 @@ def bpm_compute(self, chi3=1e-19, kerr=False, kerr_loop=1,
self.field = self.absorption(alpha, lost_beg, lost_end)
if kerr:
- [self.dn[self.i, :], self.nl_mat[self.i, :],
+ [dn[self.i, :], self.nl_mat[self.i, :],
self.field, self.current_power] = self.kerr_effect(
- chi3=chi3, kerr_loop=kerr_loop, variance_check=variance_check)
+ dn, chi3=chi3, kerr_loop=kerr_loop,
+ variance_check=variance_check)
else:
# Influence of the index modulation on the field
self.field *= np.exp(1j * self.nl_mat[self.i, :])
@@ -1129,7 +1138,7 @@ def bpm_compute(self, chi3=1e-19, kerr=False, kerr_loop=1,
# useless but act as a reminder for what the the method does
return self.current_power
- def main_compute(self, chi3=1e-19, kerr=False, kerr_loop=1,
+ def main_compute(self, dn, chi3=1e-19, kerr=False, kerr_loop=1,
variance_check=False,
alpha=0, lost_beg=None, lost_end=None):
"""
@@ -1177,6 +1186,7 @@ def main_compute(self, chi3=1e-19, kerr=False, kerr_loop=1,
self.i = i
# Compute non-linear and linear propagation for every z
self.bpm_compute(
+ dn,
chi3=chi3, kerr=kerr, kerr_loop=kerr_loop,
variance_check=variance_check, alpha=alpha,
lost_beg=lost_beg, lost_end=lost_end)
@@ -1207,25 +1217,26 @@ def example_bpm():
dist_x = 0.1
length_x = 500
- bpm = Bpm(width, no, delta_no,
+ bpm = Bpm(no,
length_z, dist_z, nbr_z_disp,
length_x, dist_x)
[length_z, nbr_z, nbr_z_disp, length_x, nbr_x, x] = bpm.create_x_z()
-# shape = bpm.squared_guide()
- shape = bpm.gauss_guide(4)
+# shape = bpm.squared_guide(width)
+ shape = bpm.gauss_guide(width, 4)
nbr_p = 3
p = 13
offset_guide = 0
[peaks, dn] = bpm.create_guides(
- shape, nbr_p, p, offset_guide=offset_guide)
+ shape, delta_no, nbr_p, p, offset_guide=offset_guide)
# curve = 40 * 1E-8
# half_delay = 1000
# distance_factor = 1.2
-# [peaks, dn] = bpm.create_curved_guides(shape, curve, half_delay,
+# [peaks, dn] = bpm.create_curved_guides(shape, width, delta_no,
+# curve, half_delay,
# distance_factor,
# offset_guide=offset_guide)
@@ -1254,17 +1265,19 @@ def example_bpm():
# field_i = bpm.squared_light(fwhm, offset_light=offset_light)
# [field_i, h, gamma, beta] = bpm.all_modes(
+# width, delta_no
# lo, offset_light=offset_light)
# mode = 0
# [field_i, h, gamma, beta] = bpm.mode_light(
+# width, delta_no,
# mode, lo, offset_light=offset_light)
field[i] = field_i
irrad = [1 * 1E13]*nbr_light
theta_ext = 0
- [progress_pow] = bpm.init_field(field, theta_ext, irrad, lo)
+ [progress_pow] = bpm.init_field(dn, field, theta_ext, irrad, lo)
def _show_plot(pow_index):
plt.figure()
@@ -1320,7 +1333,7 @@ def _show_plot(pow_index):
width_lost = np.array([width_lost])
alpha = alpha/1000
[lost_beg, lost_end] = bpm.losses_position(
- guide_lost, width_lost)
+ peaks, guide_lost, width_lost)
else:
alpha = 0
lost_beg = 0
@@ -1337,6 +1350,7 @@ def _show_plot(pow_index):
debut = time.process_time()
[progress_pow] = bpm.main_compute(
+ dn,
chi3=chi3, kerr=kerr, kerr_loop=kerr_loop,
variance_check=variance_check, alpha=alpha,
lost_beg=lost_beg, lost_end=lost_end)
diff --git a/beampy/interface.py b/beampy/interface.py
index 9c48bb5..d748cc1 100644
--- a/beampy/interface.py
+++ b/beampy/interface.py
@@ -2,9 +2,10 @@
# Form implementation generated from reading ui file 'interface.ui'
#
-# Created by: PyQt5 UI code generator 5.13.1
+# Created by: PyQt5 UI code generator 5.15.1
#
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again. Do not edit this file unless you know what you are doing.
from PyQt5 import QtCore, QtGui, QtWidgets
@@ -57,7 +58,6 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_length_z.setDecimals(3)
self.doubleSpinBox_length_z.setMinimum(0.001)
self.doubleSpinBox_length_z.setMaximum(100000.0)
- self.doubleSpinBox_length_z.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
self.doubleSpinBox_length_z.setProperty("value", 10000.0)
self.doubleSpinBox_length_z.setObjectName("doubleSpinBox_length_z")
self.formLayout_10.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_length_z)
@@ -69,7 +69,6 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_dist_z.setDecimals(3)
self.doubleSpinBox_dist_z.setMinimum(0.001)
self.doubleSpinBox_dist_z.setMaximum(100000.0)
- self.doubleSpinBox_dist_z.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
self.doubleSpinBox_dist_z.setProperty("value", 1.0)
self.doubleSpinBox_dist_z.setObjectName("doubleSpinBox_dist_z")
self.formLayout_10.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_dist_z)
@@ -92,7 +91,6 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_length_x.setDecimals(3)
self.doubleSpinBox_length_x.setMinimum(0.001)
self.doubleSpinBox_length_x.setMaximum(10000.0)
- self.doubleSpinBox_length_x.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
self.doubleSpinBox_length_x.setProperty("value", 1000.0)
self.doubleSpinBox_length_x.setObjectName("doubleSpinBox_length_x")
self.formLayout_10.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_length_x)
@@ -104,10 +102,21 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_dist_x.setDecimals(3)
self.doubleSpinBox_dist_x.setMinimum(0.001)
self.doubleSpinBox_dist_x.setMaximum(100.0)
- self.doubleSpinBox_dist_x.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
self.doubleSpinBox_dist_x.setProperty("value", 0.2)
self.doubleSpinBox_dist_x.setObjectName("doubleSpinBox_dist_x")
self.formLayout_10.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_dist_x)
+ self.label_n = QtWidgets.QLabel(self.frame_window)
+ self.label_n.setObjectName("label_n")
+ self.formLayout_10.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_n)
+ self.doubleSpinBox_n = QtWidgets.QDoubleSpinBox(self.frame_window)
+ self.doubleSpinBox_n.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
+ self.doubleSpinBox_n.setDecimals(6)
+ self.doubleSpinBox_n.setMinimum(1.0)
+ self.doubleSpinBox_n.setMaximum(1000.0)
+ self.doubleSpinBox_n.setSingleStep(0.1)
+ self.doubleSpinBox_n.setProperty("value", 2.14)
+ self.doubleSpinBox_n.setObjectName("doubleSpinBox_n")
+ self.formLayout_10.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_n)
self.verticalLayout_guide.addWidget(self.frame_window)
spacerItem = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
self.verticalLayout_guide.addItem(spacerItem)
@@ -124,22 +133,45 @@ def setupUi(self, MainWindow):
self.frame_guides.setObjectName("frame_guides")
self.formLayout_6 = QtWidgets.QFormLayout(self.frame_guides)
self.formLayout_6.setObjectName("formLayout_6")
+ self.comboBox_guide = QtWidgets.QComboBox(self.frame_guides)
+ self.comboBox_guide.setMaximumSize(QtCore.QSize(100, 16777215))
+ self.comboBox_guide.setObjectName("comboBox_guide")
+ self.formLayout_6.setWidget(0, QtWidgets.QFormLayout.SpanningRole, self.comboBox_guide)
+ self.Qframe_guide_create = QtWidgets.QFrame(self.frame_guides)
+ self.Qframe_guide_create.setFrameShape(QtWidgets.QFrame.StyledPanel)
+ self.Qframe_guide_create.setFrameShadow(QtWidgets.QFrame.Raised)
+ self.Qframe_guide_create.setObjectName("Qframe_guide_create")
+ self.gridLayout_2 = QtWidgets.QGridLayout(self.Qframe_guide_create)
+ self.gridLayout_2.setObjectName("gridLayout_2")
+ self.pushButton_save_guide = QtWidgets.QPushButton(self.Qframe_guide_create)
+ self.pushButton_save_guide.setObjectName("pushButton_save_guide")
+ self.gridLayout_2.addWidget(self.pushButton_save_guide, 1, 0, 1, 1)
+ self.pushButton_delete_guide = QtWidgets.QPushButton(self.Qframe_guide_create)
+ self.pushButton_delete_guide.setObjectName("pushButton_delete_guide")
+ self.gridLayout_2.addWidget(self.pushButton_delete_guide, 0, 1, 1, 1)
+ self.pushButton_create_guide = QtWidgets.QPushButton(self.Qframe_guide_create)
+ self.pushButton_create_guide.setObjectName("pushButton_create_guide")
+ self.gridLayout_2.addWidget(self.pushButton_create_guide, 0, 0, 1, 1)
+ self.pushButton_cancel_guide = QtWidgets.QPushButton(self.Qframe_guide_create)
+ self.pushButton_cancel_guide.setStatusTip("")
+ self.pushButton_cancel_guide.setObjectName("pushButton_cancel_guide")
+ self.gridLayout_2.addWidget(self.pushButton_cancel_guide, 1, 1, 1, 1)
+ self.formLayout_6.setWidget(1, QtWidgets.QFormLayout.SpanningRole, self.Qframe_guide_create)
self.label_width = QtWidgets.QLabel(self.frame_guides)
self.label_width.setObjectName("label_width")
- self.formLayout_6.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_width)
+ self.formLayout_6.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_width)
self.doubleSpinBox_width = QtWidgets.QDoubleSpinBox(self.frame_guides)
self.doubleSpinBox_width.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.doubleSpinBox_width.setDecimals(3)
self.doubleSpinBox_width.setMinimum(0.0)
self.doubleSpinBox_width.setMaximum(10000.0)
self.doubleSpinBox_width.setSingleStep(1.0)
- self.doubleSpinBox_width.setStepType(QtWidgets.QAbstractSpinBox.DefaultStepType)
self.doubleSpinBox_width.setProperty("value", 8.0)
self.doubleSpinBox_width.setObjectName("doubleSpinBox_width")
- self.formLayout_6.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_width)
+ self.formLayout_6.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_width)
self.label_offset_guide = QtWidgets.QLabel(self.frame_guides)
self.label_offset_guide.setObjectName("label_offset_guide")
- self.formLayout_6.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label_offset_guide)
+ self.formLayout_6.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_offset_guide)
self.doubleSpinBox_offset_guide = QtWidgets.QDoubleSpinBox(self.frame_guides)
self.doubleSpinBox_offset_guide.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.doubleSpinBox_offset_guide.setDecimals(3)
@@ -147,35 +179,22 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_offset_guide.setMaximum(5000.0)
self.doubleSpinBox_offset_guide.setProperty("value", 0.0)
self.doubleSpinBox_offset_guide.setObjectName("doubleSpinBox_offset_guide")
- self.formLayout_6.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_offset_guide)
- self.doubleSpinBox_n = QtWidgets.QDoubleSpinBox(self.frame_guides)
- self.doubleSpinBox_n.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
- self.doubleSpinBox_n.setDecimals(6)
- self.doubleSpinBox_n.setMinimum(1.0)
- self.doubleSpinBox_n.setMaximum(1000.0)
- self.doubleSpinBox_n.setSingleStep(0.1)
- self.doubleSpinBox_n.setProperty("value", 2.14)
- self.doubleSpinBox_n.setObjectName("doubleSpinBox_n")
- self.formLayout_6.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_n)
- self.label_n = QtWidgets.QLabel(self.frame_guides)
- self.label_n.setObjectName("label_n")
- self.formLayout_6.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_n)
+ self.formLayout_6.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_offset_guide)
self.label_dn = QtWidgets.QLabel(self.frame_guides)
self.label_dn.setObjectName("label_dn")
- self.formLayout_6.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_dn)
+ self.formLayout_6.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_dn)
self.doubleSpinBox_dn = QtWidgets.QDoubleSpinBox(self.frame_guides)
self.doubleSpinBox_dn.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.doubleSpinBox_dn.setDecimals(6)
self.doubleSpinBox_dn.setMinimum(1e-06)
self.doubleSpinBox_dn.setMaximum(1000.0)
- self.doubleSpinBox_dn.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
self.doubleSpinBox_dn.setProperty("value", 0.001)
self.doubleSpinBox_dn.setObjectName("doubleSpinBox_dn")
- self.formLayout_6.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_dn)
+ self.formLayout_6.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_dn)
self.radioButton_gaussian = QtWidgets.QRadioButton(self.frame_guides)
self.radioButton_gaussian.setChecked(True)
self.radioButton_gaussian.setObjectName("radioButton_gaussian")
- self.formLayout_6.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.radioButton_gaussian)
+ self.formLayout_6.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.radioButton_gaussian)
self.spinBox_gauss_pow = QtWidgets.QSpinBox(self.frame_guides)
self.spinBox_gauss_pow.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.spinBox_gauss_pow.setSuffix("")
@@ -184,16 +203,13 @@ def setupUi(self, MainWindow):
self.spinBox_gauss_pow.setSingleStep(1)
self.spinBox_gauss_pow.setProperty("value", 4)
self.spinBox_gauss_pow.setObjectName("spinBox_gauss_pow")
- self.formLayout_6.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.spinBox_gauss_pow)
+ self.formLayout_6.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.spinBox_gauss_pow)
self.radioButton_squared = QtWidgets.QRadioButton(self.frame_guides)
self.radioButton_squared.setObjectName("radioButton_squared")
- self.formLayout_6.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.radioButton_squared)
- self.verticalLayout_guide.addWidget(self.frame_guides)
- spacerItem1 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
- self.verticalLayout_guide.addItem(spacerItem1)
- self.tabWidget_morphology_guide = QtWidgets.QTabWidget(self.tabWidget_guide)
- self.tabWidget_morphology_guide.setMinimumSize(QtCore.QSize(370, 0))
- self.tabWidget_morphology_guide.setMaximumSize(QtCore.QSize(370, 16777215))
+ self.formLayout_6.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.radioButton_squared)
+ self.tabWidget_morphology_guide = QtWidgets.QTabWidget(self.frame_guides)
+ self.tabWidget_morphology_guide.setMinimumSize(QtCore.QSize(350, 0))
+ self.tabWidget_morphology_guide.setMaximumSize(QtCore.QSize(350, 16777215))
self.tabWidget_morphology_guide.setToolTip("")
self.tabWidget_morphology_guide.setObjectName("tabWidget_morphology_guide")
self.tab_array = QtWidgets.QWidget()
@@ -216,16 +232,9 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_p.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.doubleSpinBox_p.setDecimals(3)
self.doubleSpinBox_p.setMaximum(10000.0)
- self.doubleSpinBox_p.setStepType(QtWidgets.QAbstractSpinBox.DefaultStepType)
self.doubleSpinBox_p.setProperty("value", 15.0)
self.doubleSpinBox_p.setObjectName("doubleSpinBox_p")
self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_p)
- self.calculateButton_array = QtWidgets.QPushButton(self.tab_array)
- self.calculateButton_array.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
- self.calculateButton_array.setObjectName("calculateButton_array")
- self.formLayout.setWidget(3, QtWidgets.QFormLayout.SpanningRole, self.calculateButton_array)
- spacerItem2 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
- self.formLayout.setItem(2, QtWidgets.QFormLayout.LabelRole, spacerItem2)
self.tabWidget_morphology_guide.addTab(self.tab_array, "")
self.tab_curved = QtWidgets.QWidget()
self.tab_curved.setObjectName("tab_curved")
@@ -249,7 +258,6 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_half_delay.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.doubleSpinBox_half_delay.setDecimals(3)
self.doubleSpinBox_half_delay.setMaximum(100000.0)
- self.doubleSpinBox_half_delay.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
self.doubleSpinBox_half_delay.setProperty("value", 1000.0)
self.doubleSpinBox_half_delay.setObjectName("doubleSpinBox_half_delay")
self.formLayout_2.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_half_delay)
@@ -260,23 +268,21 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_distance_factor.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.doubleSpinBox_distance_factor.setDecimals(3)
self.doubleSpinBox_distance_factor.setMaximum(10000.0)
- self.doubleSpinBox_distance_factor.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
self.doubleSpinBox_distance_factor.setProperty("value", 1.2)
self.doubleSpinBox_distance_factor.setObjectName("doubleSpinBox_distance_factor")
self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_distance_factor)
- self.calculateButton_curved = QtWidgets.QPushButton(self.tab_curved)
- self.calculateButton_curved.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
- self.calculateButton_curved.setObjectName("calculateButton_curved")
- self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.SpanningRole, self.calculateButton_curved)
self.tabWidget_morphology_guide.addTab(self.tab_curved, "")
- self.verticalLayout_guide.addWidget(self.tabWidget_morphology_guide)
- spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
- self.verticalLayout_guide.addItem(spacerItem3)
- self.pushButton_cancel_guide = QtWidgets.QPushButton(self.tabWidget_guide)
- self.pushButton_cancel_guide.setMaximumSize(QtCore.QSize(100, 16777215))
- self.pushButton_cancel_guide.setStatusTip("")
- self.pushButton_cancel_guide.setObjectName("pushButton_cancel_guide")
- self.verticalLayout_guide.addWidget(self.pushButton_cancel_guide)
+ self.formLayout_6.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.tabWidget_morphology_guide)
+ self.verticalLayout_guide.addWidget(self.frame_guides)
+ self.calculateButton_guide = QtWidgets.QPushButton(self.tabWidget_guide)
+ self.calculateButton_guide.setMaximumSize(QtCore.QSize(370, 16777215))
+ self.calculateButton_guide.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
+ self.calculateButton_guide.setObjectName("calculateButton_guide")
+ self.verticalLayout_guide.addWidget(self.calculateButton_guide)
+ spacerItem1 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+ self.verticalLayout_guide.addItem(spacerItem1)
+ spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+ self.verticalLayout_guide.addItem(spacerItem2)
self.horizontalLayout_2.addLayout(self.verticalLayout_guide)
self.plot_guide = QtWidgets.QVBoxLayout()
self.plot_guide.setObjectName("plot_guide")
@@ -293,6 +299,7 @@ def setupUi(self, MainWindow):
self.label_light_informations.setObjectName("label_light_informations")
self.verticalLayout_light.addWidget(self.label_light_informations)
self.frame_light = QtWidgets.QFrame(self.tabWidget_light)
+ self.frame_light.setMinimumSize(QtCore.QSize(370, 0))
self.frame_light.setMaximumSize(QtCore.QSize(370, 16777215))
self.frame_light.setFrameShape(QtWidgets.QFrame.Box)
self.frame_light.setFrameShadow(QtWidgets.QFrame.Raised)
@@ -307,7 +314,6 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_lo.setDecimals(4)
self.doubleSpinBox_lo.setMinimum(0.01)
self.doubleSpinBox_lo.setMaximum(100.0)
- self.doubleSpinBox_lo.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
self.doubleSpinBox_lo.setProperty("value", 1.5)
self.doubleSpinBox_lo.setObjectName("doubleSpinBox_lo")
self.formLayout_lo_theta.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_lo)
@@ -321,9 +327,10 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_theta_ext.setObjectName("doubleSpinBox_theta_ext")
self.formLayout_lo_theta.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_theta_ext)
self.verticalLayout_light.addWidget(self.frame_light)
- spacerItem4 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
- self.verticalLayout_light.addItem(spacerItem4)
+ spacerItem3 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+ self.verticalLayout_light.addItem(spacerItem3)
self.frame_beam = QtWidgets.QFrame(self.tabWidget_light)
+ self.frame_beam.setMinimumSize(QtCore.QSize(370, 0))
self.frame_beam.setMaximumSize(QtCore.QSize(370, 16777215))
self.frame_beam.setFrameShape(QtWidgets.QFrame.Box)
self.frame_beam.setFrameShadow(QtWidgets.QFrame.Raised)
@@ -332,6 +339,7 @@ def setupUi(self, MainWindow):
self.formLayout_5.setObjectName("formLayout_5")
self.comboBox_light = QtWidgets.QComboBox(self.frame_beam)
self.comboBox_light.setMaximumSize(QtCore.QSize(100, 16777215))
+ self.comboBox_light.setToolTipDuration(-1)
self.comboBox_light.setObjectName("comboBox_light")
self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.SpanningRole, self.comboBox_light)
self.Qframe_beam_create = QtWidgets.QFrame(self.frame_beam)
@@ -390,80 +398,89 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_intensity_light.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.doubleSpinBox_intensity_light.setDecimals(5)
self.doubleSpinBox_intensity_light.setMaximum(10000.0)
- self.doubleSpinBox_intensity_light.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
self.doubleSpinBox_intensity_light.setProperty("value", 1.0)
self.doubleSpinBox_intensity_light.setObjectName("doubleSpinBox_intensity_light")
self.formLayout_5.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_intensity_light)
+ spacerItem4 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+ self.formLayout_5.setItem(7, QtWidgets.QFormLayout.LabelRole, spacerItem4)
self.radioButton_gaussian_light = QtWidgets.QRadioButton(self.frame_beam)
self.radioButton_gaussian_light.setEnabled(True)
self.radioButton_gaussian_light.setChecked(True)
self.radioButton_gaussian_light.setObjectName("radioButton_gaussian_light")
self.formLayout_5.setWidget(8, QtWidgets.QFormLayout.SpanningRole, self.radioButton_gaussian_light)
+ spacerItem5 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+ self.formLayout_5.setItem(9, QtWidgets.QFormLayout.LabelRole, spacerItem5)
self.radioButton_squared_light = QtWidgets.QRadioButton(self.frame_beam)
self.radioButton_squared_light.setChecked(False)
self.radioButton_squared_light.setObjectName("radioButton_squared_light")
self.formLayout_5.setWidget(10, QtWidgets.QFormLayout.SpanningRole, self.radioButton_squared_light)
+ spacerItem6 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+ self.formLayout_5.setItem(12, QtWidgets.QFormLayout.LabelRole, spacerItem6)
self.radioButton_mode = QtWidgets.QRadioButton(self.frame_beam)
self.radioButton_mode.setObjectName("radioButton_mode")
self.formLayout_5.setWidget(13, QtWidgets.QFormLayout.LabelRole, self.radioButton_mode)
self.spinBox_mode = QtWidgets.QSpinBox(self.frame_beam)
+ self.spinBox_mode.setEnabled(False)
self.spinBox_mode.setAutoFillBackground(False)
self.spinBox_mode.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.spinBox_mode.setMaximum(50)
self.spinBox_mode.setObjectName("spinBox_mode")
self.formLayout_5.setWidget(13, QtWidgets.QFormLayout.FieldRole, self.spinBox_mode)
+ self.spinBox_guide_nbr_ref = QtWidgets.QSpinBox(self.frame_beam)
+ self.spinBox_guide_nbr_ref.setEnabled(False)
+ self.spinBox_guide_nbr_ref.setObjectName("spinBox_guide_nbr_ref")
+ self.formLayout_5.setWidget(15, QtWidgets.QFormLayout.FieldRole, self.spinBox_guide_nbr_ref)
+ self.pushButton_mode_number = QtWidgets.QPushButton(self.frame_beam)
+ self.pushButton_mode_number.setObjectName("pushButton_mode_number")
+ self.formLayout_5.setWidget(17, QtWidgets.QFormLayout.LabelRole, self.pushButton_mode_number)
+ self.mode_number = QtWidgets.QLCDNumber(self.frame_beam)
+ self.mode_number.setMaximumSize(QtCore.QSize(100, 16777215))
+ self.mode_number.setObjectName("mode_number")
+ self.formLayout_5.setWidget(17, QtWidgets.QFormLayout.FieldRole, self.mode_number)
+ spacerItem7 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+ self.formLayout_5.setItem(18, QtWidgets.QFormLayout.LabelRole, spacerItem7)
self.radioButton_all_modes = QtWidgets.QRadioButton(self.frame_beam)
self.radioButton_all_modes.setObjectName("radioButton_all_modes")
- self.formLayout_5.setWidget(16, QtWidgets.QFormLayout.LabelRole, self.radioButton_all_modes)
+ self.formLayout_5.setWidget(19, QtWidgets.QFormLayout.LabelRole, self.radioButton_all_modes)
+ spacerItem8 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+ self.formLayout_5.setItem(21, QtWidgets.QFormLayout.LabelRole, spacerItem8)
self.radioButton_airy = QtWidgets.QRadioButton(self.frame_beam)
self.radioButton_airy.setObjectName("radioButton_airy")
- self.formLayout_5.setWidget(19, QtWidgets.QFormLayout.LabelRole, self.radioButton_airy)
+ self.formLayout_5.setWidget(22, QtWidgets.QFormLayout.LabelRole, self.radioButton_airy)
self.label_zero_cut = QtWidgets.QLabel(self.frame_beam)
self.label_zero_cut.setObjectName("label_zero_cut")
- self.formLayout_5.setWidget(20, QtWidgets.QFormLayout.LabelRole, self.label_zero_cut)
+ self.formLayout_5.setWidget(23, QtWidgets.QFormLayout.LabelRole, self.label_zero_cut)
self.spinBox_airy_zero = QtWidgets.QSpinBox(self.frame_beam)
+ self.spinBox_airy_zero.setEnabled(False)
self.spinBox_airy_zero.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.spinBox_airy_zero.setMinimum(1)
self.spinBox_airy_zero.setMaximum(10000)
self.spinBox_airy_zero.setProperty("value", 10)
self.spinBox_airy_zero.setObjectName("spinBox_airy_zero")
- self.formLayout_5.setWidget(20, QtWidgets.QFormLayout.FieldRole, self.spinBox_airy_zero)
+ self.formLayout_5.setWidget(23, QtWidgets.QFormLayout.FieldRole, self.spinBox_airy_zero)
self.label_lobe_size = QtWidgets.QLabel(self.frame_beam)
self.label_lobe_size.setObjectName("label_lobe_size")
- self.formLayout_5.setWidget(21, QtWidgets.QFormLayout.LabelRole, self.label_lobe_size)
+ self.formLayout_5.setWidget(24, QtWidgets.QFormLayout.LabelRole, self.label_lobe_size)
self.doubleSpinBox_lobe_size = QtWidgets.QDoubleSpinBox(self.frame_beam)
+ self.doubleSpinBox_lobe_size.setEnabled(False)
self.doubleSpinBox_lobe_size.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.doubleSpinBox_lobe_size.setMaximum(10000.0)
self.doubleSpinBox_lobe_size.setProperty("value", 8.0)
self.doubleSpinBox_lobe_size.setObjectName("doubleSpinBox_lobe_size")
- self.formLayout_5.setWidget(21, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_lobe_size)
- spacerItem5 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
- self.formLayout_5.setItem(18, QtWidgets.QFormLayout.LabelRole, spacerItem5)
- spacerItem6 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
- self.formLayout_5.setItem(12, QtWidgets.QFormLayout.LabelRole, spacerItem6)
- spacerItem7 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
- self.formLayout_5.setItem(7, QtWidgets.QFormLayout.LabelRole, spacerItem7)
- spacerItem8 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
- self.formLayout_5.setItem(15, QtWidgets.QFormLayout.LabelRole, spacerItem8)
- self.pushButton_mode_number = QtWidgets.QPushButton(self.frame_beam)
- self.pushButton_mode_number.setObjectName("pushButton_mode_number")
- self.formLayout_5.setWidget(14, QtWidgets.QFormLayout.LabelRole, self.pushButton_mode_number)
- self.mode_number = QtWidgets.QLCDNumber(self.frame_beam)
- self.mode_number.setMaximumSize(QtCore.QSize(100, 16777215))
- self.mode_number.setObjectName("mode_number")
- self.formLayout_5.setWidget(14, QtWidgets.QFormLayout.FieldRole, self.mode_number)
- spacerItem9 = QtWidgets.QSpacerItem(20, 5, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
- self.formLayout_5.setItem(9, QtWidgets.QFormLayout.LabelRole, spacerItem9)
+ self.formLayout_5.setWidget(24, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_lobe_size)
+ self.label_guide_nbr_ref = QtWidgets.QLabel(self.frame_beam)
+ self.label_guide_nbr_ref.setObjectName("label_guide_nbr_ref")
+ self.formLayout_5.setWidget(15, QtWidgets.QFormLayout.LabelRole, self.label_guide_nbr_ref)
self.verticalLayout_light.addWidget(self.frame_beam)
- spacerItem10 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
- self.verticalLayout_light.addItem(spacerItem10)
+ spacerItem9 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+ self.verticalLayout_light.addItem(spacerItem9)
self.calculateButton_light = QtWidgets.QPushButton(self.tabWidget_light)
self.calculateButton_light.setMaximumSize(QtCore.QSize(370, 16777215))
self.calculateButton_light.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
self.calculateButton_light.setObjectName("calculateButton_light")
self.verticalLayout_light.addWidget(self.calculateButton_light)
- spacerItem11 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
- self.verticalLayout_light.addItem(spacerItem11)
+ spacerItem10 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+ self.verticalLayout_light.addItem(spacerItem10)
self.horizontalLayout_4.addLayout(self.verticalLayout_light)
self.plot_light = QtWidgets.QVBoxLayout()
self.plot_light.setObjectName("plot_light")
@@ -522,13 +539,12 @@ def setupUi(self, MainWindow):
self.doubleSpinBox_lost.setCorrectionMode(QtWidgets.QAbstractSpinBox.CorrectToNearestValue)
self.doubleSpinBox_lost.setDecimals(5)
self.doubleSpinBox_lost.setMaximum(10000.0)
- self.doubleSpinBox_lost.setStepType(QtWidgets.QAbstractSpinBox.AdaptiveDecimalStepType)
self.doubleSpinBox_lost.setProperty("value", 1.0)
self.doubleSpinBox_lost.setObjectName("doubleSpinBox_lost")
self.formLayout_8.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.doubleSpinBox_lost)
self.verticalLayout_compute.addWidget(self.frame_lost)
- spacerItem12 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
- self.verticalLayout_compute.addItem(spacerItem12)
+ spacerItem11 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+ self.verticalLayout_compute.addItem(spacerItem11)
self.label_kerr_informations = QtWidgets.QLabel(self.tabWidget_compute)
self.label_kerr_informations.setMinimumSize(QtCore.QSize(0, 62))
self.label_kerr_informations.setMouseTracking(True)
@@ -588,8 +604,8 @@ def setupUi(self, MainWindow):
self.pushButton_estimate_time.setObjectName("pushButton_estimate_time")
self.formLayout_estimate.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.pushButton_estimate_time)
self.verticalLayout_compute.addLayout(self.formLayout_estimate)
- spacerItem13 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
- self.verticalLayout_compute.addItem(spacerItem13)
+ spacerItem12 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Maximum)
+ self.verticalLayout_compute.addItem(spacerItem12)
self.calculateButton_compute = QtWidgets.QPushButton(self.tabWidget_compute)
self.calculateButton_compute.setMinimumSize(QtCore.QSize(370, 0))
self.calculateButton_compute.setMaximumSize(QtCore.QSize(370, 16777215))
@@ -599,8 +615,8 @@ def setupUi(self, MainWindow):
self.checkBox_check_power = QtWidgets.QCheckBox(self.tabWidget_compute)
self.checkBox_check_power.setObjectName("checkBox_check_power")
self.verticalLayout_compute.addWidget(self.checkBox_check_power)
- spacerItem14 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
- self.verticalLayout_compute.addItem(spacerItem14)
+ spacerItem13 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+ self.verticalLayout_compute.addItem(spacerItem13)
self.verticalLayout_compute_plot.addLayout(self.verticalLayout_compute)
self.pushButton_cancel_compute = QtWidgets.QPushButton(self.tabWidget_compute)
self.pushButton_cancel_compute.setMaximumSize(QtCore.QSize(100, 16777215))
@@ -619,35 +635,44 @@ def setupUi(self, MainWindow):
self.retranslateUi(MainWindow)
self.tabWidget_main.setCurrentIndex(0)
self.tabWidget_morphology_guide.setCurrentIndex(0)
- self.checkBox_offset_light.clicked['bool'].connect(self.doubleSpinBox_offset_light.setDisabled)
+ self.checkBox_offset_light.toggled['bool'].connect(self.doubleSpinBox_offset_light.setDisabled)
self.checkBox_kerr.clicked['bool'].connect(self.frame_kerr.setEnabled)
- self.checkBox_offset_light.clicked['bool'].connect(self.spinBox_offset_light_peak.setEnabled)
+ self.checkBox_offset_light.toggled['bool'].connect(self.spinBox_offset_light_peak.setEnabled)
self.checkBox_lost.clicked['bool'].connect(self.frame_lost.setEnabled)
self.checkBox_kerr.clicked['bool'].connect(self.checkBox_variance.setEnabled)
self.comboBox_light.activated['QString'].connect(self.pushButton_cancel_light.click)
+ self.comboBox_guide.activated['QString'].connect(self.pushButton_cancel_guide.click)
+ self.radioButton_airy.toggled['bool'].connect(self.doubleSpinBox_lobe_size.setEnabled)
+ self.radioButton_airy.toggled['bool'].connect(self.spinBox_airy_zero.setEnabled)
+ self.radioButton_mode.toggled['bool'].connect(self.spinBox_mode.setEnabled)
+ self.radioButton_gaussian.toggled['bool'].connect(self.spinBox_gauss_pow.setEnabled)
+ self.radioButton_mode.toggled['bool'].connect(self.spinBox_guide_nbr_ref.setEnabled)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
MainWindow.setTabOrder(self.tabWidget_main, self.doubleSpinBox_length_z)
MainWindow.setTabOrder(self.doubleSpinBox_length_z, self.doubleSpinBox_dist_z)
MainWindow.setTabOrder(self.doubleSpinBox_dist_z, self.spinBox_nbr_z_disp)
MainWindow.setTabOrder(self.spinBox_nbr_z_disp, self.doubleSpinBox_length_x)
MainWindow.setTabOrder(self.doubleSpinBox_length_x, self.doubleSpinBox_dist_x)
- MainWindow.setTabOrder(self.doubleSpinBox_dist_x, self.doubleSpinBox_width)
+ MainWindow.setTabOrder(self.doubleSpinBox_dist_x, self.doubleSpinBox_n)
+ MainWindow.setTabOrder(self.doubleSpinBox_n, self.comboBox_guide)
+ MainWindow.setTabOrder(self.comboBox_guide, self.pushButton_create_guide)
+ MainWindow.setTabOrder(self.pushButton_create_guide, self.pushButton_delete_guide)
+ MainWindow.setTabOrder(self.pushButton_delete_guide, self.pushButton_save_guide)
+ MainWindow.setTabOrder(self.pushButton_save_guide, self.pushButton_cancel_guide)
+ MainWindow.setTabOrder(self.pushButton_cancel_guide, self.doubleSpinBox_width)
MainWindow.setTabOrder(self.doubleSpinBox_width, self.doubleSpinBox_offset_guide)
- MainWindow.setTabOrder(self.doubleSpinBox_offset_guide, self.doubleSpinBox_n)
- MainWindow.setTabOrder(self.doubleSpinBox_n, self.doubleSpinBox_dn)
+ MainWindow.setTabOrder(self.doubleSpinBox_offset_guide, self.doubleSpinBox_dn)
MainWindow.setTabOrder(self.doubleSpinBox_dn, self.radioButton_gaussian)
MainWindow.setTabOrder(self.radioButton_gaussian, self.spinBox_gauss_pow)
MainWindow.setTabOrder(self.spinBox_gauss_pow, self.radioButton_squared)
MainWindow.setTabOrder(self.radioButton_squared, self.tabWidget_morphology_guide)
MainWindow.setTabOrder(self.tabWidget_morphology_guide, self.spinBox_nb_p)
MainWindow.setTabOrder(self.spinBox_nb_p, self.doubleSpinBox_p)
- MainWindow.setTabOrder(self.doubleSpinBox_p, self.calculateButton_array)
- MainWindow.setTabOrder(self.calculateButton_array, self.doubleSpinBox_curve)
+ MainWindow.setTabOrder(self.doubleSpinBox_p, self.calculateButton_guide)
+ MainWindow.setTabOrder(self.calculateButton_guide, self.doubleSpinBox_curve)
MainWindow.setTabOrder(self.doubleSpinBox_curve, self.doubleSpinBox_half_delay)
MainWindow.setTabOrder(self.doubleSpinBox_half_delay, self.doubleSpinBox_distance_factor)
- MainWindow.setTabOrder(self.doubleSpinBox_distance_factor, self.calculateButton_curved)
- MainWindow.setTabOrder(self.calculateButton_curved, self.pushButton_cancel_guide)
- MainWindow.setTabOrder(self.pushButton_cancel_guide, self.doubleSpinBox_lo)
+ MainWindow.setTabOrder(self.doubleSpinBox_distance_factor, self.doubleSpinBox_lo)
MainWindow.setTabOrder(self.doubleSpinBox_lo, self.doubleSpinBox_theta_ext)
MainWindow.setTabOrder(self.doubleSpinBox_theta_ext, self.comboBox_light)
MainWindow.setTabOrder(self.comboBox_light, self.pushButton_create_beam)
@@ -705,7 +730,18 @@ def retranslateUi(self, MainWindow):
self.label_dist_x.setText(_translate("MainWindow", "x step"))
self.doubleSpinBox_dist_x.setToolTip(_translate("MainWindow", "Step over x in µm"))
self.doubleSpinBox_dist_x.setSuffix(_translate("MainWindow", " µm"))
+ self.label_n.setToolTip(_translate("MainWindow", "Refractive index of the background \"cladding\""))
+ self.label_n.setText(_translate("MainWindow", "n background"))
+ self.doubleSpinBox_n.setToolTip(_translate("MainWindow", "Refractive index of the cladding"))
self.label_guides_information.setText(_translate("MainWindow", "Guides information
"))
+ self.comboBox_guide.setToolTip(_translate("MainWindow", "Select the waveguide"))
+ self.pushButton_save_guide.setText(_translate("MainWindow", "save waveguide"))
+ self.pushButton_delete_guide.setToolTip(_translate("MainWindow", "Delete the current displayed waveguide"))
+ self.pushButton_delete_guide.setText(_translate("MainWindow", "delete waveguide"))
+ self.pushButton_create_guide.setToolTip(_translate("MainWindow", "Add a new waveguide with current displayed values"))
+ self.pushButton_create_guide.setText(_translate("MainWindow", "add waveguide"))
+ self.pushButton_cancel_guide.setToolTip(_translate("MainWindow", "cancel guide changes"))
+ self.pushButton_cancel_guide.setText(_translate("MainWindow", "Cancel changes"))
self.label_width.setToolTip(_translate("MainWindow", "Guide width define as the diameter in µm at 1/e"))
self.label_width.setText(_translate("MainWindow", "Width"))
self.doubleSpinBox_width.setToolTip(_translate("MainWindow", "Guide width define as the diameter in µm at 1/e"))
@@ -714,9 +750,6 @@ def retranslateUi(self, MainWindow):
self.label_offset_guide.setText(_translate("MainWindow", "Guide offset"))
self.doubleSpinBox_offset_guide.setToolTip(_translate("MainWindow", "Guide offset from the center in µm"))
self.doubleSpinBox_offset_guide.setSuffix(_translate("MainWindow", " µm"))
- self.doubleSpinBox_n.setToolTip(_translate("MainWindow", "Refractive index of the cladding"))
- self.label_n.setToolTip(_translate("MainWindow", "Refractive index of the cladding"))
- self.label_n.setText(_translate("MainWindow", "n"))
self.label_dn.setToolTip(_translate("MainWindow", "Difference of refractive index between the core and the cladding"))
self.label_dn.setText(_translate("MainWindow", "Δn"))
self.doubleSpinBox_dn.setToolTip(_translate("MainWindow", "Difference of refractive index between the core and the cladding"))
@@ -733,8 +766,6 @@ def retranslateUi(self, MainWindow):
self.label_p.setText(_translate("MainWindow", "Interval between guides"))
self.doubleSpinBox_p.setToolTip(_translate("MainWindow", "Distance between two guides center in µm"))
self.doubleSpinBox_p.setSuffix(_translate("MainWindow", " µm"))
- self.calculateButton_array.setToolTip(_translate("MainWindow", "Compute an array of guides"))
- self.calculateButton_array.setText(_translate("MainWindow", "Compute array of guides"))
self.tabWidget_morphology_guide.setTabText(self.tabWidget_morphology_guide.indexOf(self.tab_array), _translate("MainWindow", "waveguide array"))
self.label_curve.setToolTip(_translate("MainWindow", "curvature factor in 10^-8 1/µm^2"))
self.label_curve.setText(_translate("MainWindow", "Curvature"))
@@ -748,11 +779,9 @@ def retranslateUi(self, MainWindow):
self.label_distance_factor.setText(_translate("MainWindow", "p_min/width"))
self.doubleSpinBox_distance_factor.setToolTip(_translate("MainWindow", "Distance factor: p_min/width"))
self.doubleSpinBox_distance_factor.setSuffix(_translate("MainWindow", " µm"))
- self.calculateButton_curved.setToolTip(_translate("MainWindow", "Compute the curved guides define as : - offset_guide + curve*(z - length_z/2 - half_delay)**2 + width*distance_factor)"))
- self.calculateButton_curved.setText(_translate("MainWindow", "Compute curved guides"))
self.tabWidget_morphology_guide.setTabText(self.tabWidget_morphology_guide.indexOf(self.tab_curved), _translate("MainWindow", "curved waveguides"))
- self.pushButton_cancel_guide.setToolTip(_translate("MainWindow", "cancel guide changes"))
- self.pushButton_cancel_guide.setText(_translate("MainWindow", "Cancel changes"))
+ self.calculateButton_guide.setToolTip(_translate("MainWindow", "Compute an array of guides"))
+ self.calculateButton_guide.setText(_translate("MainWindow", "Compute guides"))
self.tabWidget_main.setTabText(self.tabWidget_main.indexOf(self.tabWidget_guide), _translate("MainWindow", "Guides"))
self.label_light_informations.setText(_translate("MainWindow", "