Closed paul-freeman closed 7 years ago
Hi Paul,
Thanks for the changes!
The DS345 change is slick, and we should also be able to do the same for polytec/vibrometer.py and quanta_ray/QRay_driver.py correct?
Jami
On Fri, Nov 18, 2016 at 12:58 PM Paul Freeman notifications@github.com wrote:
Hi Jami (PALab people, too),
I'm giving you a pull request so you can see how it works and start looking at some of the changes I've made. We can meet up if you want me to go over any of it.
I think you'd be the most interested in the DS345 changes I made. For one, it's now a subclass of Serial, instead of being a class of it's own containing just a Serial object. It's a small difference, but it allows using just 'self' instead of 'self.fgen' everywhere. Also, it better describes what's going on - a function generator is a subclass of all serial devices.
Anyway, we can discuss anything you want. Just let me know.
-Paul
You can view, comment on, or merge this pull request online at:
https://github.com/PALab/PLACE/pull/1 Commit Summary
- updated print statements for Python 3
- added classifiers to indicate support for Python 2.7 and 3.5; also cleanup
- updated to match source
- various Python 3 updates
- fixed print statement and removed dos line endings
- remove .pyc files and add .gitignore
- ignoring Python .coverage files
- sample unittest file
- removed sudo requirement
- removed sudo requirement; made DS345 a subclass of Serial; some code cleanup; some Python 3 updates
File Changes
- A .gitignore https://github.com/PALab/PLACE/pull/1/files#diff-0 (8)
- M place/automate/SRS/DS345_driver.py https://github.com/PALab/PLACE/pull/1/files#diff-1 (773)
- D place/automate/SRS/DS345_driver.pyc https://github.com/PALab/PLACE/pull/1/files#diff-2 (0)
- D place/automate/SRS/init.pyc https://github.com/PALab/PLACE/pull/1/files#diff-3 (0)
- A place/automate/SRS/test_DS345_driver.py https://github.com/PALab/PLACE/pull/1/files#diff-4 (46)
- M place/automate/new_focus/picomotor.py https://github.com/PALab/PLACE/pull/1/files#diff-5 (79)
- M place/automate/osci_card/controller.py https://github.com/PALab/PLACE/pull/1/files#diff-6 (46)
- M place/automate/osci_card/parseConstants.py https://github.com/PALab/PLACE/pull/1/files#diff-7 (11)
- M place/automate/osci_card/utility.py https://github.com/PALab/PLACE/pull/1/files#diff-8 (1)
- M place/automate/polytec/vibrometer.py https://github.com/PALab/PLACE/pull/1/files#diff-9 (61)
- M place/automate/quanta_ray/QRay_driver.py https://github.com/PALab/PLACE/pull/1/files#diff-10 (31)
- M place/automate/scan/scanFunctions.py https://github.com/PALab/PLACE/pull/1/files#diff-11 (113)
- M place/automate/tektronix/TEK_driver.py https://github.com/PALab/PLACE/pull/1/files#diff-12 (12)
- M place/automate/tektronix/httplib2.py https://github.com/PALab/PLACE/pull/1/files#diff-13 (75)
- M place/automate/xps_control/XPS_C8_drivers.py https://github.com/PALab/PLACE/pull/1/files#diff-14 (6239)
- M place/scripts/encheck.py https://github.com/PALab/PLACE/pull/1/files#diff-15 (19)
- M place/scripts/picomove.py https://github.com/PALab/PLACE/pull/1/files#diff-16 (11)
- M place/scripts/scan.py https://github.com/PALab/PLACE/pull/1/files#diff-17 (23)
- M place/scripts/scan.py~ https://github.com/PALab/PLACE/pull/1/files#diff-18 (19)
- M setup.py https://github.com/PALab/PLACE/pull/1/files#diff-19 (34)
Patch Links:
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/PALab/PLACE/pull/1, or mute the thread https://github.com/notifications/unsubscribe-auth/AGtwoAscgB0hZE2eVhmY04NzeSYuPDJlks5q_OoZgaJpZM4K19tR .
Yeah. There is probably a lot we could do. For example, openConnection could be an overridden version of the open() method in Serial. That would allow you to just call:
fgen = DS345()
fgen.open()
Next time you are running a scan, we should try it with Python 3 and see how much stuff breaks. I can clean up code as I go.
Sounds good. I will probably run a scan next week.
On Fri, Nov 18, 2016 at 2:01 PM Paul Freeman notifications@github.com wrote:
Yeah. There is probably a lot we could do. For example, openConnection could be an overridden version of the open() method in Serial. That would allow you to just call:
fgen = DS345() fgen.open()
Next time you are running a scan, we should try it with Python 3 and see how much stuff breaks. I can clean up code as I go.
— You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub https://github.com/PALab/PLACE/pull/1#issuecomment-261418742, or mute the thread https://github.com/notifications/unsubscribe-auth/AGtwoN87oduRuRG-3Cl5VqHCBJFe4PAQks5q_PjGgaJpZM4K19tR .
Hi Jami (PALab people, too),
I'm giving you a pull request so you can see how it works and start looking at some of the changes I've made. We can meet up if you want me to go over any of it.
I think you'd be the most interested in the DS345 changes I made. For one, it's now a subclass of Serial, instead of being a class of it's own containing just a Serial object. It's a small difference, but it allows using just 'self' instead of 'self.fgen' everywhere. Also, it better describes what's going on - a function generator is a subclass of all serial devices.
Anyway, we can discuss anything you want. Just let me know.
-Paul