Skip to content
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

Jump to bottom

Photon counting #25

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

Photon counting #25

wants to merge 16 commits into from

Commits on Jun 26, 2015

  1. update nidaq test script

    @campagnola @mgraupe
    campagnola authored and mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    5914952 View commit details
    Browse the repository at this point in the history

  2. supertask assumes devices are RTSI-connected by default

    @campagnola @mgraupe
    campagnola authored and mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    2e9980c View commit details
    Browse the repository at this point in the history

  3. nidaq tests running again

    @campagnola @mgraupe
    campagnola authored and mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    5f17189 View commit details
    Browse the repository at this point in the history

  4. Added sharing of common trigger in SuperTask->configureClocks

    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    cd1b68d View commit details
    Browse the repository at this point in the history

  5. Implemented synchronization across devices, as an example in test.py … 

    …and in SuperTask.py
    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    14c93f1 View commit details
    Browse the repository at this point in the history

  6. Removed some print commands

    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    93855e3 View commit details
    Browse the repository at this point in the history

  7. Synchronization bug in SuperTask removed.

    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    d5d0917 View commit details
    Browse the repository at this point in the history

  8. Added photon counting to test.py script. Implemented necessary change… 

    …s in nidaq.py.
    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    832490b View commit details
    Browse the repository at this point in the history

  9. Added analog output and simultaneous counting example in test.py

    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    eaf0d8c View commit details
    Browse the repository at this point in the history

  10. Imporved synchronization across different devices. Sync is now based … 

    …on the device family, which is queried in configureClocks of Supertask.py.
    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    7c2368d View commit details
    Browse the repository at this point in the history

  11. Number of devices is queried and multi-device synchronization occurs … 

    …only if more than one device is involved.
    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    a4b2da4 View commit details
    Browse the repository at this point in the history

  12. Bug fixes regarding multiDevice query.

    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    2905662 View commit details
    Browse the repository at this point in the history

  13. Added the possibility to directly count photons - i.e. counting the d… 

    …igital signal from the photo-multipier - instead of recording the PMT output through the analog input.
    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    2b65a9f View commit details
    Browse the repository at this point in the history

  14. Added counting photon to task runner interface of PMT.

    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    e867861 View commit details
    Browse the repository at this point in the history

  15. Moved differentiation of counting input to devices/NIDAQ/nidaq.py: Ta… 

    …sk.getData()
    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    9d24135 View commit details
    Browse the repository at this point in the history

  16. removed bug in nidaq.py by adding reference to numpy functions

    @mgraupe
    mgraupe committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    14e35e6 View commit details
    Browse the repository at this point in the history