Repository navigation
Use the pylablib Shamrock actuator in the ShamrockSCMOS plugin - #35
Merged
Merged
Conversation
…eclare them Windows only Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Tdiso1u1ZhikSutj2Qs5Cg
Contributor
Author
|
Generated by Claude Code |
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Tdiso1u1ZhikSutj2Qs5Cg
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stacked on #34 (base is its branch; retarget to
5.0.xonce #34 is merged).Before:
daq_1Dviewer_ShamrockSCMOSanddaq_1Dviewer_ShamrockSCMOSLegacyimportdaq_move_plugins.daq_move_Shamrock, which #32 removed, so they cannot be imported on5.0.x.After:
ShamrockSCMOS(composite) usesDAQ_Move_ShamrockPllfor the spectrometer, asShamrockCCDPlldoes:SetNumberPixelsSR,SetPixelWidthSRandGetCalibrationSRbecomeset_number_pixels,set_pixel_widthandget_calibration()(metres, converted to nm), and the wavelength is read withget_wavelength(). The number of pixels is set again before each calibration read, because the ROI may have changed.ShamrockSCMOSLegacy(double inheritance) is left as it is and imports the actuator frompymodaq_plugins_andor.legacy(Keep the replaced plugins in a legacy folder #34).supported_platforms = ('win32',): they load the Andor SDK3 (and, for the legacy one, the Shamrock SDK) withctypes.windll. With the declaration, PyMoDAQ >= 5.3.5 refuses to initialize them elsewhere and the plugin tests skip them instead of failing.Tested: no hardware. The file compiles and
check_pluginwas run locally on Linux. Not verified: the SDK3 camera and the pylablib Shamrock in the same process, and the calibration values and flip of the wavelength axis against a real spectrometer. The CI of5.0.xis red for reasons I cannot read in the logs.🤖 Generated with Claude Code
https://claude.ai/code/session_01Tdiso1u1ZhikSutj2Qs5Cg