Skip to content

Commit a73a48e

Browse files
committed
hardcoding the triggerscope varibles to match mantis
1 parent 6ad55e8 commit a73a48e

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

recOrder/calib/Calibration.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ def __init__(
7474
"LCB": (LC_DEVICE_NAME, "Retardance LC-B [in waves]"),
7575
"LCA-Voltage": (LC_DEVICE_NAME, "Voltage (V) LC-A"),
7676
"LCB-Voltage": (LC_DEVICE_NAME, "Voltage (V) LC-B"),
77-
"LCA-DAC": ("TS_DAC01", "Volts"),
78-
"LCB-DAC": ("TS_DAC02", "Volts"),
77+
"LCA-DAC": ("TS1_DAC01", "Volts"),
78+
"LCB-DAC": ("TS1_DAC02", "Volts"),
7979
"State0": (
8080
LC_DEVICE_NAME,
8181
"Pal. elem. 00; enter 0 to define; 1 to activate",
@@ -182,8 +182,8 @@ def __init__(
182182
self._shutter_state = None
183183

184184
def set_dacs(self, lca_dac, lcb_dac):
185-
self.PROPERTIES["LCA-DAC"] = (f"TS_{lca_dac}", "Volts")
186-
self.PROPERTIES["LCB-DAC"] = (f"TS_{lcb_dac}", "Volts")
185+
self.PROPERTIES["LCA-DAC"] = (f"TS1_{lca_dac}", "Volts")
186+
self.PROPERTIES["LCB-DAC"] = (f"TS1_{lcb_dac}", "Volts")
187187

188188
def set_wavelength(self, wavelength):
189189
self.calib.set_wavelength(wavelength)

recOrder/plugin/main_widget.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,16 +1378,17 @@ def enter_calib_mode(self):
13781378
self.ui.cb_lcb.show()
13791379
self.ui.label_lca.show()
13801380
self.ui.label_lcb.show()
1381-
13821381
cfg = self.mmc.getConfigData(self.config_group, "State0")
1383-
13841382
# Update the DAC combo boxes with available DAC's from the config. Necessary for the user
13851383
# to specify which DAC output corresponds to which LC for voltage-space calibration
13861384
memory = set()
13871385
for i in range(cfg.size()):
13881386
prop = cfg.getSetting(i)
1387+
print(f'properties {str(prop.getDeviceLabel())}')
13891388
if "TS" in prop.getDeviceLabel() and "DAC" in prop.getDeviceLabel():
13901389
dac = prop.getDeviceLabel()[-2:]
1390+
# print(f' device type {self.mmc.getDeviceType()}')
1391+
13911392
if dac not in memory:
13921393
self.ui.cb_lca.addItem("DAC" + dac)
13931394
self.ui.cb_lcb.addItem("DAC" + dac)

0 commit comments

Comments
 (0)