SpinnakerCamera #42
Merged
SpinnakerCamera #42
Conversation
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
Adding a camera interface that uses FLIR's newer PySpin/Spinnaker API. DSB
chrisjbillington
requested changes
May 23, 2020
|
@chrisjbillington These all look easy to solve ourselves - are you happy if I push minor changes so we can merge before the 3.0.0 release? |
|
@philipstarkey yep, that sounds fine to me! |
|
Thank you for taking care of the changes. They’re continually being pushed to the bottom of my to-do list.
… On Jun 22, 2020, at 10:16 PM, Chris Billington ***@***.***> wrote:
@philipstarkey yep, that sounds fine to me!
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
@dsbarker Do I have permission to push to your branch? There should be a checkbox on the right hand side of this page to allow project authors to push changes to this PR. If it is already checked I might be doing something wrong on my end... |
It's not already checked @philipstarkey , otherwise you and I would see a "Add more commits by pushing to the SpinnakerCamera branch on JQIamo/labscript-devices" immediately below the most recent message (which I don't). |
|
Hmmm... The checkbox is not there. The problem is likely that the fork is in the JQIamo. Perhaps even with organization ownership privileges, I'm not allowed to give you permission in this way? I'll give you access to the fork manually and that should fix it. |
|
I've just sent an invite to my fork. |
philipstarkey
added a commit
that referenced
this pull request
Jun 25, 2020
commit c9de425 Author: Phil Starkey <[email protected]> Date: Thu Jun 25 19:12:29 2020 +1000 Update dependencies in setup.cfg Bumped blacs, labscript and labscript_utils versions to `>=3.0.0` commit d43ced1 Merge: 3863607 1988032 Author: Chris Billington <[email protected]> Date: Wed Jun 24 22:48:26 2020 -0400 Merge pull request #58 from philipstarkey/fix-h5py-file-mode Fix h5py deprecation warnings commit 1988032 Author: philipstarkey <[email protected]> Date: Thu Jun 25 10:48:10 2020 +1000 Fix h5py deprecation warnings Addresses labscript-suite/labscript-utils#47 for this module commit 3863607 Merge: 88eeefe cdd34f8 Author: Phil Starkey <[email protected]> Date: Wed Jun 24 10:51:04 2020 +1000 Merge pull request #54 from rpanderson/dummy_pseudoclock_updates Save clock instructions and add runviewer parser for DummyPseudoclock commit 88eeefe Merge: 55b1bd8 84eb889 Author: Phil Starkey <[email protected]> Date: Wed Jun 24 10:50:09 2020 +1000 Merge pull request #42 from JQIamo/SpinnakerCamera Added SpinnakerCamera commit cdd34f8 Author: philipstarkey <[email protected]> Date: Tue Jun 23 18:34:28 2020 +1000 Implemented review changes commit d2e5679 Author: Russell Anderson <[email protected]> Date: Fri Jun 12 18:47:25 2020 +1000 Save clock instructions (mock PineBlaster) and add runviewer_parser commit 84eb889 Author: philipstarkey <[email protected]> Date: Tue Jun 23 12:49:00 2020 +1000 Implemented review changes commit 55b1bd8 Merge: bb9f6f5 d5fca30 Author: Russell Anderson <[email protected]> Date: Mon Jun 22 18:07:08 2020 +1000 Merge pull request #57 from philipstarkey/master fix docs conf bugs identified in labscript-suite/labscript-utils#57 commit d5fca30 Author: philipstarkey <[email protected]> Date: Sat Jun 20 18:33:55 2020 +1000 fix docs conf bugs identified in labscript-suite/labscript-utils#57 commit bb9f6f5 Merge: 0f1cacd 091110b Author: Russell Anderson <[email protected]> Date: Fri Jun 19 17:57:15 2020 +1000 Merge pull request #56 from philipstarkey/master Empty sphinx project following our template commit 091110b Author: philipstarkey <[email protected]> Date: Fri Jun 19 17:42:46 2020 +1000 Empty sphinx project following our template commit 0f1cacd Author: Russell Anderson <[email protected]> Date: Wed Jun 17 16:39:08 2020 +1000 Added missing devices to README.md commit 5347098 Author: Russell Anderson <[email protected]> Date: Wed Jun 17 11:38:03 2020 +1000 Populated README.md with styling, iconogrpahy, prose, and badges commit bd2505e Author: DSB <[email protected]> Date: Mon May 4 14:27:03 2020 -0400 SpinnakerCamera Adding a camera interface that uses FLIR's newer PySpin/Spinnaker API. DSB Co-authored-by: chrisjbillington <[email protected]> Co-authored-by: Russell Anderson <[email protected]>
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.
This pull request contains a new camera interface that uses FLIR's PySpin/Spinnaker API. SpinnakerCamera is intended for users of FlyCapture2Camera that want to run labscript with Python 3.6 and newer. SpinnakerCamera requires PySpin and the Spinnaker SDK. The new code was written by S. Eckel.
We've successfully tested SpinnakerCamera in our lab using Flea3 13Y3M. During testing/coding, we've noticed that PySpin has some bugs related to when/if certain camera parameters can be set (this problem also occurs in FlyCapture2). Presumably, the parameter programming order does not depend on camera model, but we cannot be sure. Other users should be aware of the general shoddiness of FLIR's python code when deploying on their apparatus.
DSB