bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 10 Actions Packages Projects Releases 126 Wiki Activity

refactor: renamed queueID to queue_id

Browse Source
This commit is contained in:
wakonig_k 2024-03-13 21:09:45 +01:00
parent 1c7737ccda
commit 5fca3ec129
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ophyd_devices/eiger1p5m_csaxs/eiger1p5m.py
View File

@ -94,7 +94,7 @@ class Eiger1p5MDetector(Device):
self.metadata = { self.metadata = {
"scan_id": scan_msg.content["scan_id"], "scan_id": scan_msg.content["scan_id"],
"RID": scan_msg.content["info"]["RID"], "RID": scan_msg.content["info"]["RID"],
"queueID": scan_msg.content["info"]["queueID"], "queue_id": scan_msg.content["info"]["queue_id"],
} }
scan_number = scan_msg.content["info"]["scan_number"] scan_number = scan_msg.content["info"]["scan_number"]
exp_time = scan_msg.content["info"]["exp_time"] exp_time = scan_msg.content["info"]["exp_time"]

6
ophyd_devices/utils/bec_scaninfo_mixin.py
View File

@ -14,7 +14,7 @@ class BECInfoMsgMock:
def __init__( def __init__(
self, self,
mockrid: str = "mockrid1111", mockrid: str = "mockrid1111",
mockqueueid: str = "mockqueueID111", mockqueueid: str = "mockqueue_id111",
scan_number: int = 1, scan_number: int = 1,
exp_time: float = 15e-3, exp_time: float = 15e-3,
num_points: int = 500, num_points: int = 500,
@ -37,7 +37,7 @@ class BECInfoMsgMock:
"""Get BECInfoMsg object""" """Get BECInfoMsg object"""
info_msg = { info_msg = {
"RID": self.mockrid, "RID": self.mockrid,
"queueID": self.mockqueueid, "queue_id": self.mockqueueid,
"scan_number": self.scan_number, "scan_number": self.scan_number,
"exp_time": self.exp_time, "exp_time": self.exp_time,
"num_points": self.num_points, "num_points": self.num_points,
@ -117,7 +117,7 @@ class BecScaninfoMixin:
self.metadata = { self.metadata = {
"scan_id": scan_msg.content["scan_id"], "scan_id": scan_msg.content["scan_id"],
"RID": scan_msg.content["info"]["RID"], "RID": scan_msg.content["info"]["RID"],
"queueID": scan_msg.content["info"]["queueID"], "queue_id": scan_msg.content["info"]["queue_id"],
} }
self.scan_id = scan_msg.content["scan_id"] self.scan_id = scan_msg.content["scan_id"]
self.scan_number = scan_msg.content["info"]["scan_number"] self.scan_number = scan_msg.content["info"]["scan_number"]