Repository navigation
Corrected frame-based Cheetah3 acquisition #1
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,86 +3,36 @@ pymodaq_plugins_template | |
|
|
||
| .. the following must be adapted to your developed package, links to pypi, github description... | ||
|
|
||
| .. image:: https://img.shields.io/pypi/v/pymodaq_plugins_template.svg | ||
| :target: https://pypi.org/project/pymodaq_plugins_template/ | ||
| :alt: Latest Version | ||
| .. image:: https://github.com/PyMoDAQ/pymodaq_plugins_asi/workflows/Upload%20Python%20Package/badge.svg | ||
| :target: https://github.com/PyMoDAQ/pymodaq_plugins_asi | ||
| :alt: Publication Status | ||
|
|
||
| .. image:: https://readthedocs.org/projects/pymodaq/badge/?version=latest | ||
| :target: https://pymodaq.readthedocs.io/en/stable/?badge=latest | ||
| :target: https://pymodaq.readthedocs.io/en/stable/?badge=latest | ||
| :alt: Documentation Status | ||
|
|
||
| .. image:: https://github.com/PyMoDAQ/pymodaq_plugins_template/workflows/Upload%20Python%20Package/badge.svg | ||
| :target: https://github.com/PyMoDAQ/pymodaq_plugins_template | ||
| :alt: Publication Status | ||
|
|
||
| .. image:: https://github.com/PyMoDAQ/pymodaq_plugins_template/actions/workflows/Test.yml/badge.svg | ||
| :target: https://github.com/PyMoDAQ/pymodaq_plugins_template/actions/workflows/Test.yml | ||
|
|
||
|
|
||
| Use this template to create a repository on your account and start the development of your own PyMoDAQ plugin! | ||
| .. image:: https://github.com/PyMoDAQ/pymodaq_plugins_asi/actions/workflows/Test.yml/badge.svg | ||
| :target: https://github.com/PyMoDAQ/pymodaq_plugins_asi/actions/workflows/Test.yml | ||
|
|
||
|
|
||
| Authors | ||
| ======= | ||
|
|
||
| * First Author ([email protected]) | ||
| * Other author ([email protected]) | ||
|
|
||
| .. if needed use this field | ||
|
|
||
| Contributors | ||
| ============ | ||
|
|
||
| * First Contributor | ||
| * Other Contributors | ||
|
|
||
| .. if needed use this field | ||
|
|
||
| Depending on the plugin type, delete/complete the fields below | ||
|
|
||
| * Adrien Teurtrie | ||
|
|
||
| Instruments | ||
| =========== | ||
|
|
||
| Below is the list of instruments included in this plugin | ||
|
|
||
| Actuators | ||
| +++++++++ | ||
|
|
||
| * **yyy**: control of yyy actuators | ||
| * **xxx**: control of xxx actuators | ||
|
|
||
| Viewer0D | ||
| ++++++++ | ||
|
|
||
| * **yyy**: control of yyy 0D detector | ||
| * **xxx**: control of xxx 0D detector | ||
|
|
||
| Viewer1D | ||
| ++++++++ | ||
|
|
||
| * **yyy**: control of yyy 1D detector | ||
| * **xxx**: control of xxx 1D detector | ||
|
|
||
| The Cheetah3 of Amsterdam Scientific Instruments can be interfaced using this plugin. | ||
|
|
||
| Viewer2D | ||
| ++++++++ | ||
|
|
||
| * **yyy**: control of yyy 2D detector | ||
| * **xxx**: control of xxx 2D detector | ||
|
|
||
|
|
||
| PID Models | ||
| ========== | ||
|
|
||
|
|
||
| Extensions | ||
| ========== | ||
|
|
||
| * **DAQ_2DViewer_Cheetah3**: control of the Cheetah3 2D detector | ||
|
|
||
| Installation instructions | ||
| ========================= | ||
|
|
||
| * PyMoDAQ’s version. | ||
| * Operating system’s version. | ||
| * What manufacturer’s drivers should be installed to make this plugin run? | ||
| * PyMoDAQ’s version : 5.0.18 | ||
| * Operating system’s version : Windows 11 | ||
| * Serval ASI's server dedicated to the Cheetah3 should be installed (3.3.0 tested). The communication with Serval is done through http. | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,20 +9,19 @@ scanners = false # true if plugin contains custom scan layout (daq_scan extensi | |
| package-url = 'https://github.com/PyMoDAQ/pymodaq_plugins_asi' #todo modify url by your plugin url | ||
|
|
||
| [project] | ||
| name = "pymodaq_plugins_asi" #todo modify template by your plugin short name | ||
| description = 'some word about your plugin' | ||
| name = "pymodaq_plugins_asi" | ||
| description = 'Pymodaq plugin for controlling Amsterdam Scientific Instruments hardware.' | ||
| dependencies = [ | ||
| "pymodaq>=5.0.0", | ||
| #todo: list here all dependencies your package may have | ||
| requests, | ||
| pillow | ||
| ] | ||
|
|
||
| authors = [ | ||
| {name = "Teurtrie Adrien", email = "[email protected]"}, | ||
| #todo: list here all authors of your plugin | ||
| ] | ||
| maintainers = [ | ||
| {name = "Name Surname", email = "[email protected]"}, | ||
| #todo: list here all maintainers of your plugin | ||
| {name = "Adrien Teurtrie", email = "[email protected]"}, | ||
| ] | ||
|
|
||
| # nottodo: leave everything below as is! | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
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.
you can leave the stuff for pymodaq