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

Add Hamamatsu camera service #163

Merged
merged 25 commits into from
May 23, 2024
Merged

Add Hamamatsu camera service #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
edd0db0
Create HamamatsuCamera()
ivalaginja Mar 4, 2024
26160af
Add missing methods (WIP)
ivalaginja Mar 4, 2024
61bc82a
Add missing imports
ivalaginja Mar 4, 2024
784337d
Get and set some of the properties
ivalaginja Mar 4, 2024
89f52d3
Update service after initial lab tests
ivalaginja Apr 17, 2024
e0df7f2
Replace property id numbers with named properties from DCAM_IDPROP
ivalaginja Apr 17, 2024
42ec86d
Add comment
ivalaginja Apr 17, 2024
5614629
Code sneak: remove property device_name from AV cam since unused
ivalaginja Apr 17, 2024
529d177
Simplify docstrings
ivalaginja Apr 17, 2024
77935e8
Some cleaning
ivalaginja Apr 17, 2024
bee35d5
Fix typo in pixel type
ivalaginja Apr 18, 2024
f930523
Call prop_setvalue() on camera, not on library
ivalaginja Apr 18, 2024
a204ee9
Return sensor width and height as int
ivalaginja Apr 18, 2024
527d1f9
Define image dtype before submitting to data stream
ivalaginja Apr 18, 2024
a734a0a
Return ROI width and height as int
ivalaginja Apr 18, 2024
fb4c442
Stick in SENSITIVITY keyword for brightness
ivalaginja Apr 18, 2024
d2f978f
Clarify subarray mode setting
ivalaginja Apr 18, 2024
c2b7356
Read camera mode from config
ivalaginja Apr 18, 2024
a9199a2
Drop first frame in acquisition loop
ivalaginja Apr 22, 2024
8f3307f
Add log message when dropping first frame
ivalaginja Apr 22, 2024
ae34483
Handle exposure time in microseconds
ivalaginja Apr 22, 2024
243b5ca
Fix first frame dropping
THD2-team Apr 24, 2024
568bf8f
Add a service doc for the Hamamatsu camera
ivalaginja Apr 26, 2024
028928d
Specify exposure time units
ivalaginja Apr 26, 2024
d7edf0f
Add setting of detector- and hot pixel correction modes from config
ivalaginja May 23, 2024
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
2 changes: 0 additions & 2 deletions catkit2/services/allied_vision_camera/allied_vision_camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,6 @@ def make_property_helper(name, read_only=False):
make_property_helper('sensor_width', read_only=True)
make_property_helper('sensor_height', read_only=True)

make_property_helper('device_name', read_only=True)

self.make_command('start_acquisition', self.start_acquisition)
self.make_command('end_acquisition', self.end_acquisition)

Expand Down
Loading
Loading