Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

avoid power meter unresponsive state #5

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

avoid power meter unresponsive state #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c5dd60
Update _thorlabs_pm_triggered.py
ddkohler Jul 8, 2022
3f9209b
allow client restarts
ddkohler Aug 19, 2022
dfd9761
Merge branch 'main' into pm-triggered-recursion
ddkohler Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions yaqd_thorlabs/_thorlabs_pm_triggered.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,26 +92,28 @@ def __init__(self, name, config, config_filepath):

async def _measure(self):
start = time.time()
try:
self.inst.write("ABORt; INIT")
self._check_inst()
await asyncio.sleep(4e-4 * self.averaging) # important to wait for requests
for _ in range(10):
status = int(self.inst.query("STAT:OPER?")[:-1])
out = float(self.inst.query("FETCh?")[:-1])
if status & (1 << 9):
end = time.time()
self.logger.debug(f"dt: {(end-start):0.3f}, sig {out:1.6f}")
break
self.logger.debug(f"status: {bin(status)} ({status}), out {out}")
await asyncio.sleep(0)
else:
self.logger.error("measure timeout; retrying")
return await self._measure()
return {"power": float(out)}
except Exception as e: # pyvisa.errors.VisaIOError as e:
self.logger.error(e)
return await self._measure()
while True:
try:
self.inst.write("ABORt; INIT")
self._check_inst()
await asyncio.sleep(4e-4 * self.averaging) # important to wait for requests
for _ in range(10):
status = int(self.inst.query("STAT:OPER?")[:-1])
out = float(self.inst.query("FETCh?")[:-1])
if status & (1 << 9):
end = time.time()
self.logger.debug(f"dt: {(end-start):0.3f}, sig {out:1.6f}")
break
self.logger.debug(f"status: {bin(status)} ({status}), out {out}")
await asyncio.sleep(0)
else:
self.logger.error("measure timeout; retrying")
continue
except pyvisa.errors.VisaIOError as e:
self.logger.error(repr(e))
continue
break
return {"power": float(out)}

def direct_serial_write(self, write: bytes) -> None:
out = self.inst.write(write.decode())
Expand Down