Skip to content

Do not fail at import when no camera or spectrometer is found #36

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

Merged
seb5g merged 1 commit into from
Nov 4, 2026
Merged

Do not fail at import when no camera or spectrometer is found #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion src/pymodaq_plugins_andor/daq_move_plugins/daq_move_ShamrockPll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class DAQ_Move_ShamrockPll(DAQ_Move_base):


spectro_params = [
{'title': 'Spectro SN:', 'name': 'spectro_sn', 'type': 'list', 'value': SPEC_NAMES[0],
{'title': 'Spectro SN:', 'name': 'spectro_sn', 'type': 'list', 'value': SPEC_NAMES[0] if SPEC_NAMES else '',
'limits': SPEC_NAMES},
{'title': 'Spectro Settings:', 'name': 'spectro_settings', 'type': 'group', 'expanded': True, 'children': [
{'title': 'Wavelength (nm):', 'name': 'spectro_wl', 'type': 'float', 'value': 600, 'min': 0},
Expand Down
2 changes: 1 addition & 1 deletion src/pymodaq_plugins_andor/daq_viewer_plugins/plugins_2D/daq_2Dviewer_AndorCCDPll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class DAQ_2DViewer_AndorCCDPll(CameraBasePyLabLib):
hardware_averaging = True # will use the accumulate acquisition mode if averaging is necessary

cam_params = cam_params
serial_params = [{'title': 'Camera:', 'name': 'serial_number', 'type': 'list', 'value': CAM_NAMES[0],
serial_params = [{'title': 'Camera:', 'name': 'serial_number', 'type': 'list', 'value': CAM_NAMES[0] if CAM_NAMES else '',
'limits': CAM_NAMES}]
params = comon_parameters + serial_params + cam_params

Expand Down
2 changes: 1 addition & 1 deletion src/pymodaq_plugins_andor/daq_viewer_plugins/plugins_2D/daq_2Dviewer_AndorSCMOSPll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class DAQ_2DViewer_AndorSCMOSPll(CameraBasePyLabLib):
hardware_averaging = True # will use the accumulate acquisition mode if averaging is neccessary
live_mode_available = True

serial_params = [{'title': 'Camera:', 'name': 'serial_number', 'type': 'list', 'value': CAM_NAMES[0],
serial_params = [{'title': 'Camera:', 'name': 'serial_number', 'type': 'list', 'value': CAM_NAMES[0] if CAM_NAMES else '',
'limits': CAM_NAMES}]
params = comon_parameters + serial_params + cam_params

Expand Down
Loading