Skip to content

Commit 2b60a84

Browse files
committed
WIP: hamamatsu testing photon-counting
1 parent a54ff6a commit 2b60a84

1 file changed

Lines changed: 24 additions & 3 deletions

File tree

src/odemis/driver/test/hamamatsurx_test.py

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
# Export TEST_NOHW = 1 to prevent using the real hardware
3838
TEST_NOHW = (os.environ.get("TEST_NOHW", "0") != "0") # Default to Hw testing
3939

40-
#HOST_ADDRESS = "192.168.5.10"
41-
HOST_ADDRESS = "192.168.56.103"
40+
HOST_ADDRESS = "192.168.5.10"
41+
#HOST_ADDRESS = "192.168.56.103"
4242

4343
CLASS_STREAKCAM = hamamatsurx.StreakCamera
4444

@@ -68,6 +68,9 @@
6868
STREAK_CHILDREN_NO_READOUT_CAM = {"streakunit": CONFIG_STREAKUNIT,
6969
"delaybox": CONFIG_DELAYBOX}
7070

71+
STREAK_CHILDREN_SYNC_NOD = {"readoutcam": CONFIG_READOUTCAM,
72+
"streakunit": CONFIG_SYNCHROSCAN}
73+
7174
KWARGS_STREAKCAM = dict(name="streak cam", role="ccd", host=HOST_ADDRESS, port=1001,
7275
children=STREAK_CHILDREN)
7376
KWARGS_STREAKCAM_SYNC = dict(name="streak cam", role="ccd", host=HOST_ADDRESS, port=1001,
@@ -76,6 +79,10 @@
7679
KWARGS_STREAKCAM_NO_DELAYBOX = dict(name="streak cam", role="ccd", host=HOST_ADDRESS, port=1001,
7780
settings_ini="C:\\ProgramData\\Hamamatsu\\HPDTA\\hpdta-single-sweep.ini",
7881
children=STREAK_CHILDREN_NO_DELAYBOX)
82+
KWARGS_STREAKCAM_SYNC_NOD = dict(name="streak cam", role="ccd", host=HOST_ADDRESS, port=1001,
83+
settings_ini="C:\\ProgramData\\Hamamatsu\\HPDTA\\hpdta-synchroscan.ini",
84+
children=STREAK_CHILDREN_SYNC_NOD)
85+
7986
KWARGS_STREAKCAM_NO_READOUT_CAM = dict(name="streak cam", role="ccd", host=HOST_ADDRESS, port=1001,
8087
children=STREAK_CHILDREN_NO_READOUT_CAM)
8188

@@ -286,7 +293,7 @@ def setUpClass(cls):
286293
if TEST_NOHW:
287294
raise unittest.SkipTest('No streak camera HW present. Skipping tests.')
288295

289-
cls.streakcam = CLASS_STREAKCAM(**KWARGS_STREAKCAM)
296+
cls.streakcam = CLASS_STREAKCAM(**KWARGS_STREAKCAM_SYNC_NOD)
290297

291298
for child in cls.streakcam.children.value:
292299
if child.name == CONFIG_READOUTCAM["name"]:
@@ -751,6 +758,20 @@ def receive_image(dataflow, image):
751758
time.sleep(num_images * 0.2 * 2) # wait some time for acquisition to finish
752759
self.assertEqual(len(self.readoutcam.queue_events), 0)
753760

761+
# Special commands for the photon-counting mode
762+
def test_photon_counting_options(self):
763+
dev = self.streakcam
764+
param_names = dev.CamParamsList("PC")
765+
for name in param_names:
766+
vals = dev.CamParamGet("PC", name)
767+
infos = dev.CamParamInfoEx("PC", name)
768+
print(f"Param {name} has value {vals}: {infos}")
769+
770+
param_names = dev.AcqParamsList()
771+
for name in param_names:
772+
vals = dev.AcqParamInfoEx(name)
773+
print(f"Acq Param {name} has value {vals}")
774+
754775

755776
class TestHamamatsurxCamWithSpectrograph(unittest.TestCase):
756777
"""Test the Hamamatsu streak camera class with real streak camera HW and

0 commit comments

Comments
 (0)