From 6f28400f0be0b2f216f105f8c40f5f99b7bc9ca5 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 23 Jul 2024 17:04:15 -0700 Subject: [PATCH] added power unit, mode and upper limit options to selection --- app/SiEPIC_TestCreator/config.py | 2 +- .../sequences/DREAM/set_current_wavelength_sweep.py | 3 +++ .../sequences/DREAM/set_voltage_wavelength_sweep.py | 3 +++ .../sequences/DREAM/wavelength_sweep.py | 3 +++ .../sequences/IDA/set_current_wavelength_sweep_ida.py | 9 +++++++++ .../sequences/IDA/set_voltage_wavelength_sweep_ida.py | 11 ++++++++++- .../sequences/IDA/wavelength_sweep_ida.py | 11 ++++++++++- 7 files changed, 39 insertions(+), 3 deletions(-) diff --git a/app/SiEPIC_TestCreator/config.py b/app/SiEPIC_TestCreator/config.py index 6fa613e..d50bb31 100644 --- a/app/SiEPIC_TestCreator/config.py +++ b/app/SiEPIC_TestCreator/config.py @@ -1,4 +1,4 @@ class MYAPP: - version = '0.1.17' + version = '0.1.20' pypi_token = 'pypi-AgEIcHlwaS5vcmcCJGU5ZWI5NWZiLTIzODUtNDMyNi05NGQ3LWNhZWU5NWI3ZWYzMwACGlsxLFsic2llcGljLXRlc3RjcmVhdG9yIl1dAAIsWzIsWyIzNDFlYzM3OC1jYmE2LTQxMzYtYjhhZi1mN2U4ZDE5MjEzNjAiXV0AAAYgsgF4EVG7qeB7ED0QsM1jeZxjHJxBEGU39NHJaAlyQZk' diff --git a/app/SiEPIC_TestCreator/sequences/DREAM/set_current_wavelength_sweep.py b/app/SiEPIC_TestCreator/sequences/DREAM/set_current_wavelength_sweep.py index 579d870..40b4756 100644 --- a/app/SiEPIC_TestCreator/sequences/DREAM/set_current_wavelength_sweep.py +++ b/app/SiEPIC_TestCreator/sequences/DREAM/set_current_wavelength_sweep.py @@ -25,6 +25,9 @@ def __init__(self, ps): 'Power': 1, 'Power_info': 'unit dBm', 'Power_bounds': [-70, 10], + 'Power Unit': 'dBm', + 'Power Unit_info': 'choose between dBm and mW', + 'Power Unit_options': ['dBm', 'mW'], 'Sweep Speed': 20, 'Sweep Speed_info': 'controls the speed of the sweep, if yaml fails time execution test increase this', 'Upper Limit': 0, diff --git a/app/SiEPIC_TestCreator/sequences/DREAM/set_voltage_wavelength_sweep.py b/app/SiEPIC_TestCreator/sequences/DREAM/set_voltage_wavelength_sweep.py index 4323d9b..91a0500 100644 --- a/app/SiEPIC_TestCreator/sequences/DREAM/set_voltage_wavelength_sweep.py +++ b/app/SiEPIC_TestCreator/sequences/DREAM/set_voltage_wavelength_sweep.py @@ -25,6 +25,9 @@ def __init__(self, ps): 'Power': 1, 'Power_info': 'unit dBm', 'Power_bounds': [1200, 1400], + 'Power Unit': 'dBm', + 'Power Unit_info': 'choose between dBm and mW', + 'Power Unit_options': ['dBm', 'mW'], 'Sweep Speed': 20, 'Sweep Speed_info': 'controls the speed of the sweep, if yaml fails time execution test increase this', 'Upper Limit': 0, diff --git a/app/SiEPIC_TestCreator/sequences/DREAM/wavelength_sweep.py b/app/SiEPIC_TestCreator/sequences/DREAM/wavelength_sweep.py index 925468f..e0900fb 100644 --- a/app/SiEPIC_TestCreator/sequences/DREAM/wavelength_sweep.py +++ b/app/SiEPIC_TestCreator/sequences/DREAM/wavelength_sweep.py @@ -24,6 +24,9 @@ def __init__(self, ps): 'Power': 1, 'Power_info': 'unit dBm', 'Power_bounds': [-70, 100], + 'Power Unit': 'dBm', + 'Power Unit_info': 'choose between dBm and mW', + 'Power Unit_options': ['dBm', 'mW'], 'Sweep Speed': 'auto', 'Sweep Speed_info': 'controls the speed of the sweep, if yaml fails time execution test increase this', 'Sweep Speed_options': ['20nm', '10nm', 'auto'], diff --git a/app/SiEPIC_TestCreator/sequences/IDA/set_current_wavelength_sweep_ida.py b/app/SiEPIC_TestCreator/sequences/IDA/set_current_wavelength_sweep_ida.py index 92139ec..0242c17 100644 --- a/app/SiEPIC_TestCreator/sequences/IDA/set_current_wavelength_sweep_ida.py +++ b/app/SiEPIC_TestCreator/sequences/IDA/set_current_wavelength_sweep_ida.py @@ -22,6 +22,9 @@ def __init__(self, ps): 'Power': 1, 'Power_info': 'Please enter the power in dBm', 'Power_bounds': [-70, 10], + 'Power Unit': 'dBm', + 'Power Unit_info': 'choose between dBm and mW', + 'Power Unit_options': ['dBm', 'mW'], 'Sweep Speed': 'auto', 'Sweep Speed_info': 'controls the speed of the sweep, if yaml fails time execution test increase this, options are 20nm, 10nm, auto', 'Sweep Speed_options': ['20nm', '10nm', 'auto'], @@ -37,6 +40,12 @@ def __init__(self, ps): 'Initialrange': '-20', 'Initialrange_info': 'default -20', 'Initialrange_bounds': [-100, 100], + 'Upper Limit': 0, + 'Upper Limit_info': 'set to 0', + 'Upper Limit_bounds': [-30, 0], + 'Mode': 'CONT', + 'Mode_info': 'Set Mode of laser, default is CONT', + 'Mode_options': ['CONT', 'STEP'], 'Channel A': 'True', 'Channel A_info': 'Please enter True to use Channel A if not enter False', 'Channel A_options': ['True','False'], diff --git a/app/SiEPIC_TestCreator/sequences/IDA/set_voltage_wavelength_sweep_ida.py b/app/SiEPIC_TestCreator/sequences/IDA/set_voltage_wavelength_sweep_ida.py index 63aade1..b22c544 100644 --- a/app/SiEPIC_TestCreator/sequences/IDA/set_voltage_wavelength_sweep_ida.py +++ b/app/SiEPIC_TestCreator/sequences/IDA/set_voltage_wavelength_sweep_ida.py @@ -22,6 +22,9 @@ def __init__(self, ps): 'Power': 1, 'Power_info': 'unit dBm', 'Power_bounds': [-70, 10], + 'Power Unit': 'dBm', + 'Power Unit_info': 'choose between dBm and mW', + 'Power Unit_options': ['dBm', 'mW'], 'Sweep Speed': 'auto', 'Sweep Speed_info': 'controls the speed of the sweep, if yaml fails time execution test increase this, options are 20nm, 10nm, auto', 'Sweep Speed_options': ['20nm', '10nm', 'auto'], @@ -37,6 +40,12 @@ def __init__(self, ps): 'Initialrange': '-20', 'Initialrange_info': 'default -20', 'Initialrange_bounds': [-100, 100], + 'Upper Limit': 0, + 'Upper Limit_info': 'set to 0', + 'Upper Limit_bounds': [-30, 0], + 'Mode': 'CONT', + 'Mode_info': 'Set Mode of laser, default is CONT', + 'Mode_options': ['CONT', 'STEP'], 'Channel A': 'True', 'Channel A_info': 'Please enter True to use Channel A if not enter False', 'Channel A_options': ['True','False'], @@ -45,7 +54,7 @@ def __init__(self, ps): 'Channel B_options': ['True','False'], 'Voltages': '0, 1, 2', 'Voltages_info': 'Please enter voltages in units (V) in the form x1, x2, x3', - 'Voltages_bounds': [-50, 50] + 'Voltages_bounds': [-50, 50], } self.results_info = { 'num_plots': 1, diff --git a/app/SiEPIC_TestCreator/sequences/IDA/wavelength_sweep_ida.py b/app/SiEPIC_TestCreator/sequences/IDA/wavelength_sweep_ida.py index 7ec85d4..2b00464 100644 --- a/app/SiEPIC_TestCreator/sequences/IDA/wavelength_sweep_ida.py +++ b/app/SiEPIC_TestCreator/sequences/IDA/wavelength_sweep_ida.py @@ -21,6 +21,9 @@ def __init__(self, ps): 'Power': 1, 'Power_info': 'unit dBm', 'Power_bounds': [-70, 10], + 'Power Unit': 'dBm', + 'Power Unit_info': 'choose between dBm and mW', + 'Power Unit_options': ['dBm', 'mW'], 'Sweep Speed': 'auto', 'Sweep Speed_info': 'controls the speed of the sweep, if yaml fails time execution test increase this, options are 20nm, 10nm, auto', 'Sweep Speed_options': ['20nm', '10nm', 'auto'], @@ -35,7 +38,13 @@ def __init__(self, ps): 'RangeDec_bounds': [-100, 100], 'Initialrange': '-20', 'Initialrange_info': 'default -20', - 'Initialrange_bounds': [-100, 100] + 'Initialrange_bounds': [-100, 100], + 'Upper Limit': 0, + 'Upper Limit_info': 'set to 0', + 'Upper Limit_bounds': [-30, 0], + 'Mode': 'CONT', + 'Mode_info': 'Set Mode of laser, default is CONT', + 'Mode_options': ['CONT', 'STEP'], } self.results_info = {