-
Notifications
You must be signed in to change notification settings - Fork 29
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.
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
Spectrum instrumentation ADC as fast_counter hardware #131
base: main
Are you sure you want to change the base?
Conversation
src/qudi/hardware/fast_adc/spectrum/si_commands/buffer_commands.py
Outdated
Show resolved
Hide resolved
src/qudi/hardware/fast_adc/spectrum/si_commands/card_commands.py
Outdated
Show resolved
Hide resolved
src/qudi/hardware/fast_adc/spectrum/si_commands/configure_commands.py
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Takuya,
Great code. I added some small suggestions in the comments.
In my comments about the while-loops, making the thread unresponsive: It might be okay to leave it as is, if the time spent in the loop is very short, so the thread is not blocked for too long.
Where does the |
Spectrum instrumentation originally distributed some python codes with an USB stick. Recently, they shared the codes on github with MIT license: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for your reviewing. I modified the codes and replied to your comments.
Can you have a look on them?
src/qudi/hardware/fast_adc/spectrum/si_commands/buffer_commands.py
Outdated
Show resolved
Hide resolved
src/qudi/hardware/fast_adc/spectrum/si_commands/card_commands.py
Outdated
Show resolved
Hide resolved
src/qudi/hardware/fast_adc/spectrum/si_commands/configure_commands.py
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the modified code, it looks good from my side. I only have the one comment in time_series_gui.py, which I think might be a syntax error.
@@ -326,7 +326,7 @@ def update_channel_settings(self, enabled, averaged): | |||
units=different_units[0]) | |||
self._mw.trace_plot_widget.setLabel('right', | |||
self._channels_per_axis[1][0], | |||
units=different_units[1]) | |||
rev units=different_units[1]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this "rev" supposed to be here?
|
||
If the hardware does not support these features, the values should be None | ||
""" | ||
with self._threadlock: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This thread lock looks sketchy. It is not taken when writing to the same data in DataProcess.
Description
AD converter from spectrum instrumentation is implemented as fast_counter hardware.
Motivation and Context
AD card from spectrum instrumentation is newly implemented.
The class structure is organized for robustness.
How Has This Been Tested?
This hardware is tested in the pulsed toolchain.
This change does not affect the rest of the code.
Screenshots (only if appropriate, delete if not):
Types of changes
Checklist:
/docs/changelog.md
.(syntax, indentation, mutable default values, etc.).