Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cbdc1ba46f4a
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c98e24abd477
Choose a head ref
  • 9 commits
  • 6 files changed
  • 1 contributor

Commits on Apr 4, 2015

  1. pdq2: cleanup unittest

    jordens committed Apr 4, 2015
    1
    Copy the full SHA
    16ff190 View commit details
  2. pdq2: spelling fix

    jordens committed Apr 4, 2015
    Copy the full SHA
    d165358 View commit details

Commits on Apr 5, 2015

  1. Copy the full SHA
    e50661d View commit details
  2. pipistrello: use mem_decoder

    jordens committed Apr 5, 2015
    Copy the full SHA
    0ae4492 View commit details
  3. Copy the full SHA
    afc3982 View commit details
  4. 1
    Copy the full SHA
    7b86138 View commit details
  5. Copy the full SHA
    43893c6 View commit details
  6. artiq_run: refactor, support use from within experiments

    You can always (under posix) use #!/usr/bin/env artiq_run as
    shebang for experiments and make them executable.
    Now, you can also do this (portable):
    
    if __name__ == "__main__":
        from artiq.frontend.artiq_run import run
        run()
    
    to make an experiment executable. The CLI options are all inherited.
    Also:
    
    * removed --elf: can be inferred from filename
    * did some refactoring and cleanup
    * use logging for all messages, except the result printing (use -v to get
    parameter changes and dummy scheduler actions)
    jordens committed Apr 5, 2015
    Copy the full SHA
    1a1afd5 View commit details
  7. photon_histogram: add features

    * support executing it (python3 repository/photon_histogram.py)
    * show of parameters and results
    jordens committed Apr 5, 2015
    3
    Copy the full SHA
    c98e24a View commit details
Loading