Skip to content

Commit 5444cd3

Browse files
jordensjordens
committedJan 26, 2016
Merge branch 'namespace-experiment'
closes #189 * namespace-experiment: artiq_dir: move out of tools to unlink dependencies refactor Analyzer constants to unlink dependencies CoreException: store at 'py_exn.artiq_core_exception' doc: update Underflow catching example coredevice: remove some print()s language...ARTIQException -> coredevice...CoreException artiq.experiment: update examples artiq.experiment: merge language and coredevice namespaces artiq: move namespace artiq.* -> artiq.language.*
2 parents ea3bb27 + d1119d7 commit 5444cd3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+144
-137
lines changed
 

Diff for: ‎artiq/__init__.py

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
from artiq import language
2-
from artiq.language import *
3-
from artiq.coredevice.dds import (PHASE_MODE_CONTINUOUS, PHASE_MODE_ABSOLUTE,
4-
PHASE_MODE_TRACKING)
5-
6-
__all__ = []
7-
__all__.extend(language.__all__)
8-
__all__ += ["PHASE_MODE_CONTINUOUS", "PHASE_MODE_ABSOLUTE",
9-
"PHASE_MODE_TRACKING"]
10-
111
from ._version import get_versions
122
__version__ = get_versions()['version']
133
del get_versions
4+
5+
import os
6+
__artiq_dir__ = os.path.dirname(os.path.abspath(__file__))
7+
del os

Diff for: ‎artiq/coredevice/__init__.py

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
from artiq.coredevice import exceptions, dds
2+
from artiq.coredevice.exceptions import (RTIOUnderflow, RTIOSequenceError,
3+
RTIOCollisionError)
4+
from artiq.coredevice.dds import (PHASE_MODE_CONTINUOUS, PHASE_MODE_ABSOLUTE,
5+
PHASE_MODE_TRACKING)
6+
7+
__all__ = []
8+
__all__ += ["RTIOUnderflow", "RTIOSequenceError", "RTIOCollisionError"]
9+
__all__ += ["PHASE_MODE_CONTINUOUS", "PHASE_MODE_ABSOLUTE",
10+
"PHASE_MODE_TRACKING"]

0 commit comments

Comments
 (0)