diff --git a/ADR/OrderedDict.py b/ADR/OrderedDict.py deleted file mode 100644 index 7ea0c334..00000000 --- a/ADR/OrderedDict.py +++ /dev/null @@ -1,260 +0,0 @@ -## {{{ http://code.activestate.com/recipes/576693/ (r9) -# Backport of OrderedDict() class that runs on Python 2.4, 2.5, 2.6, 2.7 and pypy. -# Passes Python2.7's test suite and incorporates all the latest updates. - -try: - from thread import get_ident as _get_ident -except ImportError: - from dummy_thread import get_ident as _get_ident - -try: - from _abcoll import KeysView, ValuesView, ItemsView -except ImportError: - pass - - -class OrderedDict(dict): - 'Dictionary that remembers insertion order' - # An inherited dict maps keys to values. - # The inherited dict provides __getitem__, __len__, __contains__, and get. - # The remaining methods are order-aware. - # Big-O running times for all methods are the same as for regular dictionaries. - - # The internal self.__map dictionary maps keys to links in a doubly linked list. - # The circular doubly linked list starts and ends with a sentinel element. - # The sentinel element never gets deleted (this simplifies the algorithm). - # Each link is stored as a list of length three: [PREV, NEXT, KEY]. - - def __init__(self, *args, **kwds): - '''Initialize an ordered dictionary. Signature is the same as for - regular dictionaries, but keyword arguments are not recommended - because their insertion order is arbitrary. - - ''' - if len(args) > 1: - raise TypeError('expected at most 1 arguments, got %d' % len(args)) - try: - self.__root - except AttributeError: - self.__root = root = [] # sentinel node - root[:] = [root, root, None] - self.__map = {} - self.__update(*args, **kwds) - - def __setitem__(self, key, value, dict_setitem=dict.__setitem__): - 'od.__setitem__(i, y) <==> od[i]=y' - # Setting a new item creates a new link which goes at the end of the linked - # list, and the inherited dictionary is updated with the new key/value pair. - if key not in self: - root = self.__root - last = root[0] - last[1] = root[0] = self.__map[key] = [last, root, key] - dict_setitem(self, key, value) - - def __delitem__(self, key, dict_delitem=dict.__delitem__): - 'od.__delitem__(y) <==> del od[y]' - # Deleting an existing item uses self.__map to find the link which is - # then removed by updating the links in the predecessor and successor nodes. - dict_delitem(self, key) - link_prev, link_next, key = self.__map.pop(key) - link_prev[1] = link_next - link_next[0] = link_prev - - def __iter__(self): - 'od.__iter__() <==> iter(od)' - root = self.__root - curr = root[1] - while curr is not root: - yield curr[2] - curr = curr[1] - - def __reversed__(self): - 'od.__reversed__() <==> reversed(od)' - root = self.__root - curr = root[0] - while curr is not root: - yield curr[2] - curr = curr[0] - - def clear(self): - 'od.clear() -> None. Remove all items from od.' - try: - for node in self.__map.itervalues(): - del node[:] - root = self.__root - root[:] = [root, root, None] - self.__map.clear() - except AttributeError: - pass - dict.clear(self) - - def popitem(self, last=True): - '''od.popitem() -> (k, v), return and remove a (key, value) pair. - Pairs are returned in LIFO order if last is true or FIFO order if false. - - ''' - if not self: - raise KeyError('dictionary is empty') - root = self.__root - if last: - link = root[0] - link_prev = link[0] - link_prev[1] = root - root[0] = link_prev - else: - link = root[1] - link_next = link[1] - root[1] = link_next - link_next[0] = root - key = link[2] - del self.__map[key] - value = dict.pop(self, key) - return key, value - - # -- the following methods do not depend on the internal structure -- - - def keys(self): - 'od.keys() -> list of keys in od' - return list(self) - - def values(self): - 'od.values() -> list of values in od' - return [self[key] for key in self] - - def items(self): - 'od.items() -> list of (key, value) pairs in od' - return [(key, self[key]) for key in self] - - def iterkeys(self): - 'od.iterkeys() -> an iterator over the keys in od' - return iter(self) - - def itervalues(self): - 'od.itervalues -> an iterator over the values in od' - for k in self: - yield self[k] - - def iteritems(self): - 'od.iteritems -> an iterator over the (key, value) items in od' - for k in self: - yield (k, self[k]) - - def update(*args, **kwds): - '''od.update(E, **F) -> None. Update od from dict/iterable E and F. - - If E is a dict instance, does: for k in E: od[k] = E[k] - If E has a .keys() method, does: for k in E.keys(): od[k] = E[k] - Or if E is an iterable of items, does: for k, v in E: od[k] = v - In either case, this is followed by: for k, v in F.items(): od[k] = v - - ''' - if len(args) > 2: - raise TypeError('update() takes at most 2 positional ' - 'arguments (%d given)' % (len(args),)) - elif not args: - raise TypeError('update() takes at least 1 argument (0 given)') - self = args[0] - # Make progressively weaker assumptions about "other" - other = () - if len(args) == 2: - other = args[1] - if isinstance(other, dict): - for key in other: - self[key] = other[key] - elif hasattr(other, 'keys'): - for key in other.keys(): - self[key] = other[key] - else: - for key, value in other: - self[key] = value - for key, value in kwds.items(): - self[key] = value - - __update = update # let subclasses override update without breaking __init__ - - __marker = object() - - def pop(self, key, default=__marker): - '''od.pop(k[,d]) -> v, remove specified key and return the corresponding value. - If key is not found, d is returned if given, otherwise KeyError is raised. - - ''' - if key in self: - result = self[key] - del self[key] - return result - if default is self.__marker: - raise KeyError(key) - return default - - def setdefault(self, key, default=None): - 'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od' - if key in self: - return self[key] - self[key] = default - return default - - def __repr__(self, _repr_running={}): - 'od.__repr__() <==> repr(od)' - call_key = id(self), _get_ident() - if call_key in _repr_running: - return '...' - _repr_running[call_key] = 1 - try: - if not self: - return '%s()' % (self.__class__.__name__,) - return '%s(%r)' % (self.__class__.__name__, self.items()) - finally: - del _repr_running[call_key] - - def __reduce__(self): - 'Return state information for pickling' - items = [[k, self[k]] for k in self] - inst_dict = vars(self).copy() - for k in vars(OrderedDict()): - inst_dict.pop(k, None) - if inst_dict: - return (self.__class__, (items,), inst_dict) - return self.__class__, (items,) - - def copy(self): - 'od.copy() -> a shallow copy of od' - return self.__class__(self) - - @classmethod - def fromkeys(cls, iterable, value=None): - '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S - and values equal to v (which defaults to None). - - ''' - d = cls() - for key in iterable: - d[key] = value - return d - - def __eq__(self, other): - '''od.__eq__(y) <==> od==y. Comparison to another OD is order-sensitive - while comparison to a regular mapping is order-insensitive. - - ''' - if isinstance(other, OrderedDict): - return len(self)==len(other) and self.items() == other.items() - return dict.__eq__(self, other) - - def __ne__(self, other): - return not self == other - - # -- the following methods are only used in Python 2.7 -- - - def viewkeys(self): - "od.viewkeys() -> a set-like object providing a view on od's keys" - return KeysView(self) - - def viewvalues(self): - "od.viewvalues() -> an object providing a view on od's values" - return ValuesView(self) - - def viewitems(self): - "od.viewitems() -> a set-like object providing a view on od's items" - return ItemsView(self) -## end of http://code.activestate.com/recipes/576693/ }}} diff --git a/ADR/ADR.py b/labrad/servers/ADR/ADR.py similarity index 100% rename from ADR/ADR.py rename to labrad/servers/ADR/ADR.py diff --git a/ADR/SRSLockin.py b/labrad/servers/ADR/SRSLockin.py similarity index 100% rename from ADR/SRSLockin.py rename to labrad/servers/ADR/SRSLockin.py diff --git a/ADR/SRSLockinSerial.py b/labrad/servers/ADR/SRSLockinSerial.py similarity index 100% rename from ADR/SRSLockinSerial.py rename to labrad/servers/ADR/SRSLockinSerial.py diff --git a/ADR/SignalRecovery7265.py b/labrad/servers/ADR/SignalRecovery7265.py similarity index 100% rename from ADR/SignalRecovery7265.py rename to labrad/servers/ADR/SignalRecovery7265.py diff --git a/ADR/agilent_switch.py b/labrad/servers/ADR/agilent_switch.py similarity index 100% rename from ADR/agilent_switch.py rename to labrad/servers/ADR/agilent_switch.py diff --git a/ADR/compressor_server.py b/labrad/servers/ADR/compressor_server.py similarity index 100% rename from ADR/compressor_server.py rename to labrad/servers/ADR/compressor_server.py diff --git a/ADR/heat_switch_arduino.py b/labrad/servers/ADR/heat_switch_arduino.py similarity index 100% rename from ADR/heat_switch_arduino.py rename to labrad/servers/ADR/heat_switch_arduino.py diff --git a/ADR/heat_switch_arduino/heat_switch_andRelays_arduino.ino b/labrad/servers/ADR/heat_switch_arduino/heat_switch_andRelays_arduino.ino similarity index 100% rename from ADR/heat_switch_arduino/heat_switch_andRelays_arduino.ino rename to labrad/servers/ADR/heat_switch_arduino/heat_switch_andRelays_arduino.ino diff --git a/ADR/heat_switch_arduino/heat_switch_arduino.ino b/labrad/servers/ADR/heat_switch_arduino/heat_switch_arduino.ino similarity index 100% rename from ADR/heat_switch_arduino/heat_switch_arduino.ino rename to labrad/servers/ADR/heat_switch_arduino/heat_switch_arduino.ino diff --git a/ADR/heat_switch_server.py b/labrad/servers/ADR/heat_switch_server.py similarity index 100% rename from ADR/heat_switch_server.py rename to labrad/servers/ADR/heat_switch_server.py diff --git a/ADR/kepco_ABC.py b/labrad/servers/ADR/kepco_ABC.py similarity index 100% rename from ADR/kepco_ABC.py rename to labrad/servers/ADR/kepco_ABC.py diff --git a/ADR/kepco_BOP2020.py b/labrad/servers/ADR/kepco_BOP2020.py similarity index 100% rename from ADR/kepco_BOP2020.py rename to labrad/servers/ADR/kepco_BOP2020.py diff --git a/ADR/magnet_controller.py b/labrad/servers/ADR/magnet_controller.py similarity index 99% rename from ADR/magnet_controller.py rename to labrad/servers/ADR/magnet_controller.py index bed278f1..a31622d6 100644 --- a/ADR/magnet_controller.py +++ b/labrad/servers/ADR/magnet_controller.py @@ -54,7 +54,7 @@ from twisted.internet.task import LoopingCall from twisted.internet.defer import inlineCallbacks, returnValue -from OrderedDict import OrderedDict # if we ever go to 2.7 we can use collections.OrderedDict +from collections import OrderedDict import math, time K, A, V, T, Ohm = Unit('K'), Unit('A'), Unit('V'), Unit('T'), Unit('Ohm') diff --git a/Anritsu/anritsu_68367C.py b/labrad/servers/Anritsu/anritsu_68367C.py similarity index 100% rename from Anritsu/anritsu_68367C.py rename to labrad/servers/Anritsu/anritsu_68367C.py diff --git a/DCRack/dcRackGUI3.py b/labrad/servers/DCRack/dcRackGUI3.py similarity index 100% rename from DCRack/dcRackGUI3.py rename to labrad/servers/DCRack/dcRackGUI3.py diff --git a/DCRack/dcRackGUI3.ui b/labrad/servers/DCRack/dcRackGUI3.ui similarity index 100% rename from DCRack/dcRackGUI3.ui rename to labrad/servers/DCRack/dcRackGUI3.ui diff --git a/DCRack/dc_rack_server.py b/labrad/servers/DCRack/dc_rack_server.py similarity index 100% rename from DCRack/dc_rack_server.py rename to labrad/servers/DCRack/dc_rack_server.py diff --git a/Darlington Board/CSB14xxDll.dll b/labrad/servers/DarlingtonBoard/CSB14xxDll.dll similarity index 100% rename from Darlington Board/CSB14xxDll.dll rename to labrad/servers/DarlingtonBoard/CSB14xxDll.dll diff --git a/Darlington Board/CSB14xxDriver.inf b/labrad/servers/DarlingtonBoard/CSB14xxDriver.inf similarity index 100% rename from Darlington Board/CSB14xxDriver.inf rename to labrad/servers/DarlingtonBoard/CSB14xxDriver.inf diff --git a/Darlington Board/CSB14xxDriver.sys b/labrad/servers/DarlingtonBoard/CSB14xxDriver.sys similarity index 100% rename from Darlington Board/CSB14xxDriver.sys rename to labrad/servers/DarlingtonBoard/CSB14xxDriver.sys diff --git a/Darlington Board/darlington_board.py b/labrad/servers/DarlingtonBoard/darlington_board.py similarity index 100% rename from Darlington Board/darlington_board.py rename to labrad/servers/DarlingtonBoard/darlington_board.py diff --git a/Fit Server/dv_search.py b/labrad/servers/FitServer/dv_search.py similarity index 100% rename from Fit Server/dv_search.py rename to labrad/servers/FitServer/dv_search.py diff --git a/Fit Server/fit_server.py b/labrad/servers/FitServer/fit_server.py similarity index 98% rename from Fit Server/fit_server.py rename to labrad/servers/FitServer/fit_server.py index e91d22c3..b799294a 100644 --- a/Fit Server/fit_server.py +++ b/labrad/servers/FitServer/fit_server.py @@ -29,7 +29,6 @@ timeout = 20 ### END NODE INFO """ - from labrad import types as T, util from labrad.server import LabradServer, setting, Signal from labrad.util import hydrant @@ -39,8 +38,8 @@ from twisted.internet.defer import inlineCallbacks, returnValue from twisted.python import log -from fit_spectroscopy import * -import fit_squid_steps +from labrad.servers.FitServer.fit_spectroscopy import * +from labrad.servers.FitServer import fit_squid_steps import time from datetime import datetime diff --git a/Fit Server/fit_spectroscopy.py b/labrad/servers/FitServer/fit_spectroscopy.py similarity index 100% rename from Fit Server/fit_spectroscopy.py rename to labrad/servers/FitServer/fit_spectroscopy.py diff --git a/Fit Server/fit_squid_steps.py b/labrad/servers/FitServer/fit_squid_steps.py similarity index 99% rename from Fit Server/fit_squid_steps.py rename to labrad/servers/FitServer/fit_squid_steps.py index 0c1aaed7..d4566a19 100644 --- a/Fit Server/fit_squid_steps.py +++ b/labrad/servers/FitServer/fit_squid_steps.py @@ -3,9 +3,10 @@ import re from pylab import * from numpy import * -from dv_search import dv_search import sys,traceback +from labrad.servers.FitServer.dv_search import dv_search + ## FUCKUP: (['','Markus','Experiments','2008/04/06 - Check Qubits'],32) diff --git a/Fit Server/fit_step_edge.py b/labrad/servers/FitServer/fit_step_edge.py similarity index 98% rename from Fit Server/fit_step_edge.py rename to labrad/servers/FitServer/fit_step_edge.py index 50ee5be4..01599b88 100644 --- a/Fit Server/fit_step_edge.py +++ b/labrad/servers/FitServer/fit_step_edge.py @@ -2,9 +2,10 @@ import re import pylab from numpy import * -from dv_search import dv_search -import sys,traceback -import fitting +import sys, traceback + +from labrad.servers.FitServer.dv_search import dv_search +from labrad.servers.FitServer import fitting class step_edge_fit: def __init__(self,amplitude,probability): diff --git a/Fit Server/fitting.py b/labrad/servers/FitServer/fitting.py similarity index 100% rename from Fit Server/fitting.py rename to labrad/servers/FitServer/fitting.py diff --git a/GHzDACs/.project b/labrad/servers/GHzDACs/.project similarity index 100% rename from GHzDACs/.project rename to labrad/servers/GHzDACs/.project diff --git a/GHzDACs/.pydevproject b/labrad/servers/GHzDACs/.pydevproject similarity index 100% rename from GHzDACs/.pydevproject rename to labrad/servers/GHzDACs/.pydevproject diff --git a/GHzDACs/FPGA_simulation.py b/labrad/servers/GHzDACs/FPGA_simulation.py similarity index 100% rename from GHzDACs/FPGA_simulation.py rename to labrad/servers/GHzDACs/FPGA_simulation.py diff --git a/GHzDACs/dac_emulator.py b/labrad/servers/GHzDACs/dac_emulator.py similarity index 99% rename from GHzDACs/dac_emulator.py rename to labrad/servers/GHzDACs/dac_emulator.py index eff72db9..a4ef6aaa 100644 --- a/GHzDACs/dac_emulator.py +++ b/labrad/servers/GHzDACs/dac_emulator.py @@ -56,7 +56,7 @@ from labrad.server import LabradServer, setting from labrad.devices import DeviceServer, DeviceWrapper -import ethernet_spoofer as es +from labrad.servers.GHzDACs import ethernet_spoofer as es REGISTRY_PATH = ['', 'Servers', 'DAC Emulator'] diff --git a/GHzDACs/direct_ethernet_proxy.py b/labrad/servers/GHzDACs/direct_ethernet_proxy.py similarity index 100% rename from GHzDACs/direct_ethernet_proxy.py rename to labrad/servers/GHzDACs/direct_ethernet_proxy.py diff --git a/GHzDACs/ethernet_spoofer.py b/labrad/servers/GHzDACs/ethernet_spoofer.py similarity index 100% rename from GHzDACs/ethernet_spoofer.py rename to labrad/servers/GHzDACs/ethernet_spoofer.py diff --git a/GHzDACs/sequencer.py b/labrad/servers/GHzDACs/sequencer.py similarity index 100% rename from GHzDACs/sequencer.py rename to labrad/servers/GHzDACs/sequencer.py diff --git a/GHz_DAC_bringup.py b/labrad/servers/GHz_DAC_bringup.py similarity index 100% rename from GHz_DAC_bringup.py rename to labrad/servers/GHz_DAC_bringup.py diff --git a/GRAPE/GRAPE.py b/labrad/servers/GRAPE/GRAPE.py similarity index 100% rename from GRAPE/GRAPE.py rename to labrad/servers/GRAPE/GRAPE.py diff --git a/GUIs/ADR/ADR.ico b/labrad/servers/GUIs/ADR/ADR.ico similarity index 100% rename from GUIs/ADR/ADR.ico rename to labrad/servers/GUIs/ADR/ADR.ico diff --git a/GUIs/ADR/ADR.png b/labrad/servers/GUIs/ADR/ADR.png similarity index 100% rename from GUIs/ADR/ADR.png rename to labrad/servers/GUIs/ADR/ADR.png diff --git a/GUIs/ADR/ADRcontrol.py b/labrad/servers/GUIs/ADR/ADRcontrol.py similarity index 99% rename from GUIs/ADR/ADRcontrol.py rename to labrad/servers/GUIs/ADR/ADRcontrol.py index 5345cf07..5949526a 100644 --- a/GUIs/ADR/ADRcontrol.py +++ b/labrad/servers/GUIs/ADR/ADRcontrol.py @@ -6,7 +6,7 @@ import sys, labrad, time, math from PyQt4 import QtCore,QtGui,uic,Qt from twisted.internet.defer import inlineCallbacks, returnValue -from LabRADPlotWidget import LabRADPlotWidget +from labrad.servers.GUIs.ADR.LabRADPlotWidget import LabRADPlotWidget DEFAULT_ADR = 'quaid' # 'cause i'm lazy diff --git a/GUIs/ADR/ADRcontrol.ui b/labrad/servers/GUIs/ADR/ADRcontrol.ui similarity index 100% rename from GUIs/ADR/ADRcontrol.ui rename to labrad/servers/GUIs/ADR/ADRcontrol.ui diff --git a/GUIs/ADR/ADRcontrol2.py b/labrad/servers/GUIs/ADR/ADRcontrol2.py similarity index 99% rename from GUIs/ADR/ADRcontrol2.py rename to labrad/servers/GUIs/ADR/ADRcontrol2.py index 7ee33ea8..351e5610 100644 --- a/GUIs/ADR/ADRcontrol2.py +++ b/labrad/servers/GUIs/ADR/ADRcontrol2.py @@ -9,7 +9,7 @@ from PyQt4 import QtCore, QtGui, uic from twisted.internet.defer import inlineCallbacks -from LabRADPlotWidget2 import LabRADPlotWidget2 +from labrad.servers.GUIs.ADR.LabRADPlotWidget2 import LabRADPlotWidget2 DEFAULT_ADR = 'quaid' # 'cause i'm lazy diff --git a/GUIs/ADR/CompressorControl.py b/labrad/servers/GUIs/ADR/CompressorControl.py similarity index 100% rename from GUIs/ADR/CompressorControl.py rename to labrad/servers/GUIs/ADR/CompressorControl.py diff --git a/GUIs/ADR/LabRADPlotWidget.py b/labrad/servers/GUIs/ADR/LabRADPlotWidget.py similarity index 100% rename from GUIs/ADR/LabRADPlotWidget.py rename to labrad/servers/GUIs/ADR/LabRADPlotWidget.py diff --git a/GUIs/ADR/LabRADPlotWidget2.py b/labrad/servers/GUIs/ADR/LabRADPlotWidget2.py similarity index 100% rename from GUIs/ADR/LabRADPlotWidget2.py rename to labrad/servers/GUIs/ADR/LabRADPlotWidget2.py diff --git a/GUIs/ADR/MagnetControl.py b/labrad/servers/GUIs/ADR/MagnetControl.py similarity index 100% rename from GUIs/ADR/MagnetControl.py rename to labrad/servers/GUIs/ADR/MagnetControl.py diff --git a/GUIs/ADR/__init__.py b/labrad/servers/GUIs/ADR/__init__.py similarity index 100% rename from GUIs/ADR/__init__.py rename to labrad/servers/GUIs/ADR/__init__.py diff --git a/GUIs/CurrentBias/__init__.py b/labrad/servers/GUIs/CurrentBias/__init__.py similarity index 100% rename from GUIs/CurrentBias/__init__.py rename to labrad/servers/GUIs/CurrentBias/__init__.py diff --git a/GUIs/CurrentBias/currentBiasDAC.py b/labrad/servers/GUIs/CurrentBias/currentBiasDAC.py similarity index 100% rename from GUIs/CurrentBias/currentBiasDAC.py rename to labrad/servers/GUIs/CurrentBias/currentBiasDAC.py diff --git a/GUIs/CurrentBias/currentBiasDAC.ui b/labrad/servers/GUIs/CurrentBias/currentBiasDAC.ui similarity index 100% rename from GUIs/CurrentBias/currentBiasDAC.ui rename to labrad/servers/GUIs/CurrentBias/currentBiasDAC.ui diff --git a/GUIs/CurrentBias/currentBiasSerial.py b/labrad/servers/GUIs/CurrentBias/currentBiasSerial.py similarity index 100% rename from GUIs/CurrentBias/currentBiasSerial.py rename to labrad/servers/GUIs/CurrentBias/currentBiasSerial.py diff --git a/GUIs/CurrentBias/currentBiasSerial.ui b/labrad/servers/GUIs/CurrentBias/currentBiasSerial.ui similarity index 100% rename from GUIs/CurrentBias/currentBiasSerial.ui rename to labrad/servers/GUIs/CurrentBias/currentBiasSerial.ui diff --git a/GUIs/CurrentBias/fpgatools2.py b/labrad/servers/GUIs/CurrentBias/fpgatools2.py similarity index 100% rename from GUIs/CurrentBias/fpgatools2.py rename to labrad/servers/GUIs/CurrentBias/fpgatools2.py diff --git a/GUIs/CurrentBias/setbias.py b/labrad/servers/GUIs/CurrentBias/setbias.py similarity index 100% rename from GUIs/CurrentBias/setbias.py rename to labrad/servers/GUIs/CurrentBias/setbias.py diff --git a/GUIs/FridgeGuardian/fridgeGuardian.py b/labrad/servers/GUIs/FridgeGuardian/fridgeGuardian.py similarity index 100% rename from GUIs/FridgeGuardian/fridgeGuardian.py rename to labrad/servers/GUIs/FridgeGuardian/fridgeGuardian.py diff --git a/GUIs/FridgeGuardian/fridgeGuardian.ui b/labrad/servers/GUIs/FridgeGuardian/fridgeGuardian.ui similarity index 100% rename from GUIs/FridgeGuardian/fridgeGuardian.ui rename to labrad/servers/GUIs/FridgeGuardian/fridgeGuardian.ui diff --git a/GUIs/LabRADPlotWidget3.py b/labrad/servers/GUIs/LabRADPlotWidget3.py similarity index 100% rename from GUIs/LabRADPlotWidget3.py rename to labrad/servers/GUIs/LabRADPlotWidget3.py diff --git a/GUIs/MBE/MBEStatus.lnk b/labrad/servers/GUIs/MBE/MBEStatus.lnk similarity index 100% rename from GUIs/MBE/MBEStatus.lnk rename to labrad/servers/GUIs/MBE/MBEStatus.lnk diff --git a/GUIs/MBE/MBEStatus.py b/labrad/servers/GUIs/MBE/MBEStatus.py similarity index 100% rename from GUIs/MBE/MBEStatus.py rename to labrad/servers/GUIs/MBE/MBEStatus.py diff --git a/GUIs/MBE/MBEStatus.ui b/labrad/servers/GUIs/MBE/MBEStatus.ui similarity index 100% rename from GUIs/MBE/MBEStatus.ui rename to labrad/servers/GUIs/MBE/MBEStatus.ui diff --git a/GUIs/SuperMonitor.py b/labrad/servers/GUIs/SuperMonitor.py similarity index 100% rename from GUIs/SuperMonitor.py rename to labrad/servers/GUIs/SuperMonitor.py diff --git a/GUIs/Wiring Editor/wireedit.py b/labrad/servers/GUIs/Wiring Editor/wireedit.py similarity index 100% rename from GUIs/Wiring Editor/wireedit.py rename to labrad/servers/GUIs/Wiring Editor/wireedit.py diff --git a/GUIs/Wiring Editor/wireedit.ui b/labrad/servers/GUIs/Wiring Editor/wireedit.ui similarity index 100% rename from GUIs/Wiring Editor/wireedit.ui rename to labrad/servers/GUIs/Wiring Editor/wireedit.ui diff --git a/GUIs/__init__.py b/labrad/servers/GUIs/__init__.py similarity index 100% rename from GUIs/__init__.py rename to labrad/servers/GUIs/__init__.py diff --git a/GUIs/qtpyplot/__init__.py b/labrad/servers/GUIs/qtpyplot/__init__.py similarity index 100% rename from GUIs/qtpyplot/__init__.py rename to labrad/servers/GUIs/qtpyplot/__init__.py diff --git a/GUIs/qtpyplot/qtpyplot.py b/labrad/servers/GUIs/qtpyplot/qtpyplot.py similarity index 100% rename from GUIs/qtpyplot/qtpyplot.py rename to labrad/servers/GUIs/qtpyplot/qtpyplot.py diff --git a/HittiteT2100/hittite_T2100.py b/labrad/servers/HittiteT2100/hittite_T2100.py similarity index 100% rename from HittiteT2100/hittite_T2100.py rename to labrad/servers/HittiteT2100/hittite_T2100.py diff --git a/PNA/agilentN5242A.py b/labrad/servers/PNA/agilentN5242A.py similarity index 100% rename from PNA/agilentN5242A.py rename to labrad/servers/PNA/agilentN5242A.py diff --git a/RS232 to GPIB/ibcl_gpib_server.py b/labrad/servers/RS232toGPIB/ibcl_gpib_server.py similarity index 100% rename from RS232 to GPIB/ibcl_gpib_server.py rename to labrad/servers/RS232toGPIB/ibcl_gpib_server.py diff --git a/RS232 to GPIB/ibcl_gpib_server_compatible.py b/labrad/servers/RS232toGPIB/ibcl_gpib_server_compatible.py similarity index 100% rename from RS232 to GPIB/ibcl_gpib_server_compatible.py rename to labrad/servers/RS232toGPIB/ibcl_gpib_server_compatible.py diff --git a/RS232 to GPIB/ibcl_server.py b/labrad/servers/RS232toGPIB/ibcl_server.py similarity index 100% rename from RS232 to GPIB/ibcl_server.py rename to labrad/servers/RS232toGPIB/ibcl_server.py diff --git a/SR770/notes.txt b/labrad/servers/SR770/notes.txt similarity index 100% rename from SR770/notes.txt rename to labrad/servers/SR770/notes.txt diff --git a/SR770/sr770.py b/labrad/servers/SR770/sr770.py similarity index 100% rename from SR770/sr770.py rename to labrad/servers/SR770/sr770.py diff --git a/SR770/sr770Debug.py b/labrad/servers/SR770/sr770Debug.py similarity index 100% rename from SR770/sr770Debug.py rename to labrad/servers/SR770/sr770Debug.py diff --git a/SR780/sr780.py b/labrad/servers/SR780/sr780.py similarity index 100% rename from SR780/sr780.py rename to labrad/servers/SR780/sr780.py diff --git a/SR830/SR830.py b/labrad/servers/SR830/SR830.py similarity index 100% rename from SR830/SR830.py rename to labrad/servers/SR830/SR830.py diff --git a/Simulations/circuit_simulator.py b/labrad/servers/Simulations/circuit_simulator.py similarity index 97% rename from Simulations/circuit_simulator.py rename to labrad/servers/Simulations/circuit_simulator.py index eb8797bb..77418af9 100644 --- a/Simulations/circuit_simulator.py +++ b/labrad/servers/Simulations/circuit_simulator.py @@ -39,9 +39,10 @@ from labrad.server import LabradServer, setting -from circuitsim import (h, hbar, phi0bar, Circuit, Capacitor, Inductor, - Mutual, Junction, Resistor, CurrentBias) -from processtools import new_priority +from labrad.servers.Simulations.circuitsim import ( + h, hbar, phi0bar, Circuit, Capacitor, Inductor, Mutual, Junction, Resistor, + CurrentBias) +from labrad.servers.Simulations.processtools import new_priority class CircuitSimulator(LabradServer): name = 'Circuit Simulator' diff --git a/Simulations/circuitsim.py b/labrad/servers/Simulations/circuitsim.py similarity index 99% rename from Simulations/circuitsim.py rename to labrad/servers/Simulations/circuitsim.py index 3b95655f..63e7f875 100644 --- a/Simulations/circuitsim.py +++ b/labrad/servers/Simulations/circuitsim.py @@ -7,7 +7,7 @@ from scipy.integrate import odeint from scipy.optimize import leastsq -from processtools import new_priority +from labrad.servers.Simulations.processtools import new_priority # define constants h = 6.626e-34 diff --git a/Simulations/processtools.py b/labrad/servers/Simulations/processtools.py similarity index 100% rename from Simulations/processtools.py rename to labrad/servers/Simulations/processtools.py diff --git a/TDS5104b_programmerManual.pdf b/labrad/servers/TDS5104b_programmerManual.pdf similarity index 100% rename from TDS5104b_programmerManual.pdf rename to labrad/servers/TDS5104b_programmerManual.pdf diff --git a/Tektronix2014B/tektronixTDS2014B.py b/labrad/servers/Tektronix2014B/tektronixTDS2014B.py similarity index 100% rename from Tektronix2014B/tektronixTDS2014B.py rename to labrad/servers/Tektronix2014B/tektronixTDS2014B.py diff --git a/Tektronix5054B/tektronix5054B.py b/labrad/servers/Tektronix5054B/tektronix5054B.py similarity index 100% rename from Tektronix5054B/tektronix5054B.py rename to labrad/servers/Tektronix5054B/tektronix5054B.py diff --git a/TektronixDSA8300/DSA8300_PROGRAMMERS_MAN.pdf b/labrad/servers/TektronixDSA8300/DSA8300_PROGRAMMERS_MAN.pdf similarity index 100% rename from TektronixDSA8300/DSA8300_PROGRAMMERS_MAN.pdf rename to labrad/servers/TektronixDSA8300/DSA8300_PROGRAMMERS_MAN.pdf diff --git a/TektronixDSA8300/tektronixDSA8300.py b/labrad/servers/TektronixDSA8300/tektronixDSA8300.py similarity index 100% rename from TektronixDSA8300/tektronixDSA8300.py rename to labrad/servers/TektronixDSA8300/tektronixDSA8300.py diff --git a/Telecomm/telecommServer.py b/labrad/servers/Telecomm/telecommServer.py similarity index 100% rename from Telecomm/telecommServer.py rename to labrad/servers/Telecomm/telecommServer.py diff --git a/_Modules/dvcp.py b/labrad/servers/_Modules/dvcp.py similarity index 100% rename from _Modules/dvcp.py rename to labrad/servers/_Modules/dvcp.py diff --git a/labrad/servers/__init__.py b/labrad/servers/__init__.py new file mode 100644 index 00000000..3ad9513f --- /dev/null +++ b/labrad/servers/__init__.py @@ -0,0 +1,2 @@ +from pkgutil import extend_path +__path__ = extend_path(__path__, __name__) diff --git a/agilent8720ES.py b/labrad/servers/agilent8720ES.py similarity index 100% rename from agilent8720ES.py rename to labrad/servers/agilent8720ES.py diff --git a/agilent_33120a_function_gen.py b/labrad/servers/agilent_33120a_function_gen.py similarity index 100% rename from agilent_33120a_function_gen.py rename to labrad/servers/agilent_33120a_function_gen.py diff --git a/agilent_34401A_dmm.py b/labrad/servers/agilent_34401A_dmm.py similarity index 100% rename from agilent_34401A_dmm.py rename to labrad/servers/agilent_34401A_dmm.py diff --git a/agilent_3640A_dc_source.py b/labrad/servers/agilent_3640A_dc_source.py similarity index 100% rename from agilent_3640A_dc_source.py rename to labrad/servers/agilent_3640A_dc_source.py diff --git a/agilent_6641A.py b/labrad/servers/agilent_6641A.py similarity index 100% rename from agilent_6641A.py rename to labrad/servers/agilent_6641A.py diff --git a/agilent_DSO7104B.py b/labrad/servers/agilent_DSO7104B.py similarity index 100% rename from agilent_DSO7104B.py rename to labrad/servers/agilent_DSO7104B.py diff --git a/agilent_E4418B.py b/labrad/servers/agilent_E4418B.py similarity index 100% rename from agilent_E4418B.py rename to labrad/servers/agilent_E4418B.py diff --git a/agilent_infiniium_scope.py b/labrad/servers/agilent_infiniium_scope.py similarity index 100% rename from agilent_infiniium_scope.py rename to labrad/servers/agilent_infiniium_scope.py diff --git a/coldSMASwitchServer.py b/labrad/servers/coldSMASwitchServer.py similarity index 100% rename from coldSMASwitchServer.py rename to labrad/servers/coldSMASwitchServer.py diff --git a/cryo_notifier.py b/labrad/servers/cryo_notifier.py similarity index 100% rename from cryo_notifier.py rename to labrad/servers/cryo_notifier.py diff --git a/dac_calibration_server.py b/labrad/servers/dac_calibration_server.py similarity index 99% rename from dac_calibration_server.py rename to labrad/servers/dac_calibration_server.py index 75892eae..2d54bde0 100644 --- a/dac_calibration_server.py +++ b/labrad/servers/dac_calibration_server.py @@ -43,7 +43,6 @@ # - added support for setting the border values - necessary for dualblock # - added support for disabling deconvolution on all IQ boards and/or all Z boards - from twisted.internet.defer import DeferredLock, inlineCallbacks, returnValue from twisted.internet.threads import deferToThread @@ -52,8 +51,8 @@ from labrad.types import Error from labrad.server import LabradServer, setting -from ghzdac import IQcorrector, DACcorrector, keys -from ghzdac.correction import fastfftlen +from labrad.servers.ghzdac import IQcorrector, DACcorrector, keys +from labrad.servers.ghzdac.correction import fastfftlen class CalibrationNotFoundError(Error): diff --git a/data_vault.py b/labrad/servers/data_vault.py similarity index 97% rename from data_vault.py rename to labrad/servers/data_vault.py index cb427342..097233d2 100644 --- a/data_vault.py +++ b/labrad/servers/data_vault.py @@ -41,8 +41,8 @@ import labrad.util import labrad.wrappers -from datavault import SessionStore -from datavault.server import DataVault +from labrad.servers.datavault import SessionStore +from labrad.servers.datavault.server import DataVault @inlineCallbacks diff --git a/data_vault_multihead.py b/labrad/servers/data_vault_multihead.py similarity index 99% rename from data_vault_multihead.py rename to labrad/servers/data_vault_multihead.py index b2fb9ee4..413207cd 100644 --- a/data_vault_multihead.py +++ b/labrad/servers/data_vault_multihead.py @@ -48,8 +48,8 @@ from labrad import constants, protocol, util import labrad.wrappers -from datavault import SessionStore -from datavault.server import DataVaultMultiHead +from labrad.servers.datavault import SessionStore +from labrad.servers.datavault.server import DataVaultMultiHead def lock_path(d): ''' diff --git a/datavault/__init__.py b/labrad/servers/datavault/__init__.py similarity index 100% rename from datavault/__init__.py rename to labrad/servers/datavault/__init__.py diff --git a/datavault/backend.py b/labrad/servers/datavault/backend.py similarity index 100% rename from datavault/backend.py rename to labrad/servers/datavault/backend.py diff --git a/datavault/dataset_format.txt b/labrad/servers/datavault/dataset_format.txt similarity index 100% rename from datavault/dataset_format.txt rename to labrad/servers/datavault/dataset_format.txt diff --git a/datavault/errors.py b/labrad/servers/datavault/errors.py similarity index 100% rename from datavault/errors.py rename to labrad/servers/datavault/errors.py diff --git a/datavault/server.py b/labrad/servers/datavault/server.py similarity index 100% rename from datavault/server.py rename to labrad/servers/datavault/server.py diff --git a/datavault/signals.md b/labrad/servers/datavault/signals.md similarity index 100% rename from datavault/signals.md rename to labrad/servers/datavault/signals.md diff --git a/datavault/test/test_backend.py b/labrad/servers/datavault/test/test_backend.py similarity index 99% rename from datavault/test/test_backend.py rename to labrad/servers/datavault/test/test_backend.py index 043eee31..00baeafe 100644 --- a/datavault/test/test_backend.py +++ b/labrad/servers/datavault/test/test_backend.py @@ -14,7 +14,7 @@ from twisted.internet import task -from datavault import backend, errors +from labrad.servers.datavault import backend, errors def _unique_filename(suffix='.hdf5'): diff --git a/datavault/test/test_datavault_package.py b/labrad/servers/datavault/test/test_datavault_package.py similarity index 99% rename from datavault/test/test_datavault_package.py rename to labrad/servers/datavault/test/test_datavault_package.py index 26e072c3..db24f69b 100644 --- a/datavault/test/test_datavault_package.py +++ b/labrad/servers/datavault/test/test_datavault_package.py @@ -9,7 +9,7 @@ from twisted.internet import task -from datavault import Session, Dataset, SessionStore +from labrad.servers.datavault import Session, Dataset, SessionStore def _unique_dir(): diff --git a/datavault/test/test_server.py b/labrad/servers/datavault/test/test_server.py similarity index 99% rename from datavault/test/test_server.py rename to labrad/servers/datavault/test/test_server.py index 988a0e1e..c5573973 100644 --- a/datavault/test/test_server.py +++ b/labrad/servers/datavault/test/test_server.py @@ -10,7 +10,7 @@ from labrad.server import LabradServer, Signal, setting from labrad import server -from datavault import backend, errors, server, SessionStore +from labrad.servers.datavault import backend, errors, server, SessionStore def _unique_dir(): diff --git a/datavault/test/test_util.py b/labrad/servers/datavault/test/test_util.py similarity index 98% rename from datavault/test/test_util.py rename to labrad/servers/datavault/test/test_util.py index 49ef853e..c3105a55 100644 --- a/datavault/test/test_util.py +++ b/labrad/servers/datavault/test/test_util.py @@ -4,7 +4,7 @@ import numpy as np -from datavault import util +from labrad.servers.datavault import util class Testutil(unittest.TestCase): @classmethod diff --git a/datavault/util.py b/labrad/servers/datavault/util.py similarity index 100% rename from datavault/util.py rename to labrad/servers/datavault/util.py diff --git a/dg535.py b/labrad/servers/dg535.py similarity index 100% rename from dg535.py rename to labrad/servers/dg535.py diff --git a/dr_logger.py b/labrad/servers/dr_logger.py similarity index 100% rename from dr_logger.py rename to labrad/servers/dr_logger.py diff --git a/fpgalib/TODO.txt b/labrad/servers/fpgalib/TODO.txt similarity index 100% rename from fpgalib/TODO.txt rename to labrad/servers/fpgalib/TODO.txt diff --git a/__init__.py b/labrad/servers/fpgalib/__init__.py similarity index 100% rename from __init__.py rename to labrad/servers/fpgalib/__init__.py diff --git a/fpgalib/adc.py b/labrad/servers/fpgalib/adc.py similarity index 99% rename from fpgalib/adc.py rename to labrad/servers/fpgalib/adc.py index d97812bb..ec5e6583 100644 --- a/fpgalib/adc.py +++ b/labrad/servers/fpgalib/adc.py @@ -2,7 +2,7 @@ import logging import numpy as np -import fpgalib.fpga as fpga +import labrad.servers.fpgalib.fpga as fpga # named functions from twisted.internet.defer import inlineCallbacks, returnValue diff --git a/fpgalib/commands.py b/labrad/servers/fpgalib/commands.py similarity index 100% rename from fpgalib/commands.py rename to labrad/servers/fpgalib/commands.py diff --git a/fpgalib/dac.py b/labrad/servers/fpgalib/dac.py similarity index 99% rename from fpgalib/dac.py rename to labrad/servers/fpgalib/dac.py index 18500eeb..fb51799a 100644 --- a/fpgalib/dac.py +++ b/labrad/servers/fpgalib/dac.py @@ -25,9 +25,9 @@ from twisted.internet.defer import inlineCallbacks, returnValue from labrad import types as T -from fpgalib.util import littleEndian -import fpgalib.fpga as fpga -import fpgalib.jump_table as jump_table +from labrad.servers.fpgalib.util import littleEndian +import labrad.servers.fpgalib.fpga as fpga +import labrad.servers.fpgalib.jump_table as jump_table # CHANGELOG # diff --git a/fpgalib/docs/ADocumentationGHzDAC_V7.doc b/labrad/servers/fpgalib/docs/ADocumentationGHzDAC_V7.doc similarity index 100% rename from fpgalib/docs/ADocumentationGHzDAC_V7.doc rename to labrad/servers/fpgalib/docs/ADocumentationGHzDAC_V7.doc diff --git a/fpgalib/docs/ADocumentationGHzDAC_V8.doc b/labrad/servers/fpgalib/docs/ADocumentationGHzDAC_V8.doc similarity index 100% rename from fpgalib/docs/ADocumentationGHzDAC_V8.doc rename to labrad/servers/fpgalib/docs/ADocumentationGHzDAC_V8.doc diff --git a/fpgalib/docs/GHzAD_v7.md b/labrad/servers/fpgalib/docs/GHzAD_v7.md similarity index 100% rename from fpgalib/docs/GHzAD_v7.md rename to labrad/servers/fpgalib/docs/GHzAD_v7.md diff --git a/fpgalib/docs/GHzDAC_v8.md b/labrad/servers/fpgalib/docs/GHzDAC_v8.md similarity index 100% rename from fpgalib/docs/GHzDAC_v8.md rename to labrad/servers/fpgalib/docs/GHzDAC_v8.md diff --git a/fpgalib/docs/HardRegProgram.txt b/labrad/servers/fpgalib/docs/HardRegProgram.txt similarity index 100% rename from fpgalib/docs/HardRegProgram.txt rename to labrad/servers/fpgalib/docs/HardRegProgram.txt diff --git a/fpgalib/docs/JumpTableIntro.md b/labrad/servers/fpgalib/docs/JumpTableIntro.md similarity index 100% rename from fpgalib/docs/JumpTableIntro.md rename to labrad/servers/fpgalib/docs/JumpTableIntro.md diff --git a/fpgalib/docs/_documentationGHzAD_v4.doc b/labrad/servers/fpgalib/docs/_documentationGHzAD_v4.doc similarity index 100% rename from fpgalib/docs/_documentationGHzAD_v4.doc rename to labrad/servers/fpgalib/docs/_documentationGHzAD_v4.doc diff --git a/fpgalib/docs/jump_table_diagram.svg b/labrad/servers/fpgalib/docs/jump_table_diagram.svg similarity index 100% rename from fpgalib/docs/jump_table_diagram.svg rename to labrad/servers/fpgalib/docs/jump_table_diagram.svg diff --git a/fpgalib/fpga.py b/labrad/servers/fpgalib/fpga.py similarity index 99% rename from fpgalib/fpga.py rename to labrad/servers/fpgalib/fpga.py index 18bd8b52..2f42aeb7 100644 --- a/fpgalib/fpga.py +++ b/labrad/servers/fpgalib/fpga.py @@ -5,7 +5,7 @@ from labrad.devices import DeviceWrapper from twisted.internet.defer import inlineCallbacks, returnValue from labrad.units import Value -from fpgalib.util import LoggingPacket +from labrad.servers.fpgalib.util import LoggingPacket # A registry of FPGA board classes. The class for each build must be added to # this registry so that the fpga server knows what type of object to construct diff --git a/fpgalib/fpga_test.py b/labrad/servers/fpgalib/fpga_test.py similarity index 99% rename from fpgalib/fpga_test.py rename to labrad/servers/fpgalib/fpga_test.py index bfda3b92..2e8ecb67 100644 --- a/fpgalib/fpga_test.py +++ b/labrad/servers/fpgalib/fpga_test.py @@ -35,8 +35,8 @@ """ import numpy as np -from fpgalib import fpga -import fpgalib.dac as dac +from labrad.servers.fpgalib import fpga +import labrad.servers.fpgalib.dac as dac from labrad.units import Value diff --git a/fpgalib/jump_table.py b/labrad/servers/fpgalib/jump_table.py similarity index 99% rename from fpgalib/jump_table.py rename to labrad/servers/fpgalib/jump_table.py index 3780b7bb..cb86bf5d 100644 --- a/fpgalib/jump_table.py +++ b/labrad/servers/fpgalib/jump_table.py @@ -2,7 +2,7 @@ # Created: July 2013 import numpy as np -from fpgalib.util import littleEndian +from labrad.servers.fpgalib.util import littleEndian IDLE_NUM_BITS = 15 IDLE_MIN_CYCLES = 0 diff --git a/fpgalib/mondict.py b/labrad/servers/fpgalib/mondict.py similarity index 100% rename from fpgalib/mondict.py rename to labrad/servers/fpgalib/mondict.py diff --git a/fpgalib/test/test_dac.py b/labrad/servers/fpgalib/test/test_dac.py similarity index 100% rename from fpgalib/test/test_dac.py rename to labrad/servers/fpgalib/test/test_dac.py diff --git a/fpgalib/test/test_fpga_server.py b/labrad/servers/fpgalib/test/test_fpga_server.py similarity index 100% rename from fpgalib/test/test_fpga_server.py rename to labrad/servers/fpgalib/test/test_fpga_server.py diff --git a/fpgalib/test/test_jump_table.py b/labrad/servers/fpgalib/test/test_jump_table.py similarity index 100% rename from fpgalib/test/test_jump_table.py rename to labrad/servers/fpgalib/test/test_jump_table.py diff --git a/fpgalib/tools/ghz_fpgas.lua b/labrad/servers/fpgalib/tools/ghz_fpgas.lua similarity index 100% rename from fpgalib/tools/ghz_fpgas.lua rename to labrad/servers/fpgalib/tools/ghz_fpgas.lua diff --git a/fpgalib/util.py b/labrad/servers/fpgalib/util.py similarity index 100% rename from fpgalib/util.py rename to labrad/servers/fpgalib/util.py diff --git a/ghz_fpga_server.py b/labrad/servers/ghz_fpga_server.py similarity index 99% rename from ghz_fpga_server.py rename to labrad/servers/ghz_fpga_server.py index c6dd9a94..67cdc2c0 100644 --- a/ghz_fpga_server.py +++ b/labrad/servers/ghz_fpga_server.py @@ -209,10 +209,10 @@ from labrad.units import Unit, Value import labrad.util -import fpgalib.adc as adc -import fpgalib.dac as dac -import fpgalib.fpga as fpga -from fpgalib.util import TimedLock, LoggingPacket +import labrad.servers.fpgalib.adc as adc +import labrad.servers.fpgalib.dac as dac +import labrad.servers.fpgalib.fpga as fpga +from labrad.servers.fpgalib.util import TimedLock, LoggingPacket # The logging level is set at the bottom of the file where the server starts. diff --git a/ghzdac/__init__.py b/labrad/servers/ghzdac/__init__.py similarity index 97% rename from ghzdac/__init__.py rename to labrad/servers/ghzdac/__init__.py index 552212f2..9bc516cd 100644 --- a/ghzdac/__init__.py +++ b/labrad/servers/ghzdac/__init__.py @@ -30,10 +30,10 @@ import labrad -from correction import (DACcorrection, IQcorrection, - cosinefilter, gaussfilter, flatfilter) -import keys -import calibrate +from labrad.servers.ghzdac.correction import ( + DACcorrection, IQcorrection, cosinefilter, gaussfilter, flatfilter) +from labrad.servers.ghzdac import keys +from labrad.servers.ghzdac import calibrate import logging diff --git a/ghzdac/calibrate.py b/labrad/servers/ghzdac/calibrate.py similarity index 99% rename from ghzdac/calibrate.py rename to labrad/servers/ghzdac/calibrate.py index 2edaadfb..08defa06 100644 --- a/ghzdac/calibrate.py +++ b/labrad/servers/ghzdac/calibrate.py @@ -22,7 +22,7 @@ import numpy as np import labrad from labrad.types import Value -import keys +from labrad.servers.ghzdac import keys #trigger to be set: #0x1: trigger S0 diff --git a/ghzdac/correction.py b/labrad/servers/ghzdac/correction.py similarity index 100% rename from ghzdac/correction.py rename to labrad/servers/ghzdac/correction.py diff --git a/ghzdac/keys.py b/labrad/servers/ghzdac/keys.py similarity index 100% rename from ghzdac/keys.py rename to labrad/servers/ghzdac/keys.py diff --git a/ghzdac_cal/GHz_DAC_calibrate.py b/labrad/servers/ghzdac_cal/GHz_DAC_calibrate.py similarity index 98% rename from ghzdac_cal/GHz_DAC_calibrate.py rename to labrad/servers/ghzdac_cal/GHz_DAC_calibrate.py index 8ead9b61..1bdb5188 100644 --- a/ghzdac_cal/GHz_DAC_calibrate.py +++ b/labrad/servers/ghzdac_cal/GHz_DAC_calibrate.py @@ -54,9 +54,9 @@ # GHz_DAC_calibrate is only a front-end, the actual calibration # routines are in ghzdac.calibrate -import ghzdac -import ghzdac.calibrate as calibrate -import ghzdac.keys as keys +from labrad.servers import ghzdac +from labrad.servers.ghzdac import calibrate +from labrad.servers.ghzdac import keys FPGA_SERVER_NAME = 'ghz_fpgas' diff --git a/fpgalib/__init__.py b/labrad/servers/ghzdac_cal/__init__.py similarity index 100% rename from fpgalib/__init__.py rename to labrad/servers/ghzdac_cal/__init__.py diff --git a/gpib_device_manager.py b/labrad/servers/gpib_device_manager.py similarity index 100% rename from gpib_device_manager.py rename to labrad/servers/gpib_device_manager.py diff --git a/gpib_server.py b/labrad/servers/gpib_server.py similarity index 100% rename from gpib_server.py rename to labrad/servers/gpib_server.py diff --git a/he_pressurizer.py b/labrad/servers/he_pressurizer.py similarity index 100% rename from he_pressurizer.py rename to labrad/servers/he_pressurizer.py diff --git a/ghzdac_cal/__init__.py b/labrad/servers/http/__init__.py similarity index 100% rename from ghzdac_cal/__init__.py rename to labrad/servers/http/__init__.py diff --git a/http/cryo_log.py b/labrad/servers/http/cryo_log.py similarity index 100% rename from http/cryo_log.py rename to labrad/servers/http/cryo_log.py diff --git a/http/cryo_log.xml b/labrad/servers/http/cryo_log.xml similarity index 100% rename from http/cryo_log.xml rename to labrad/servers/http/cryo_log.xml diff --git a/http/generate_cryo_log.py b/labrad/servers/http/generate_cryo_log.py similarity index 100% rename from http/generate_cryo_log.py rename to labrad/servers/http/generate_cryo_log.py diff --git a/http/http_server.py b/labrad/servers/http/http_server.py similarity index 100% rename from http/http_server.py rename to labrad/servers/http/http_server.py diff --git a/http/__init__.py b/labrad/servers/http/modules/__init__.py similarity index 100% rename from http/__init__.py rename to labrad/servers/http/modules/__init__.py diff --git a/http/modules/cryo_log.py b/labrad/servers/http/modules/cryo_log.py similarity index 98% rename from http/modules/cryo_log.py rename to labrad/servers/http/modules/cryo_log.py index fca3e7ed..71220634 100644 --- a/http/modules/cryo_log.py +++ b/labrad/servers/http/modules/cryo_log.py @@ -4,7 +4,7 @@ from twisted.web.template import flattenString, Element, renderer, XMLFile, tags import datetime -from http_server import render_safe +from labrad.servers.http.http_server import render_safe # # This file can be used as a template for new status pages. All you need to is diff --git a/http/modules/cryo_log.xml b/labrad/servers/http/modules/cryo_log.xml similarity index 100% rename from http/modules/cryo_log.xml rename to labrad/servers/http/modules/cryo_log.xml diff --git a/lakeshore218.py b/labrad/servers/lakeshore218.py similarity index 100% rename from lakeshore218.py rename to labrad/servers/lakeshore218.py diff --git a/lakeshore370.py b/labrad/servers/lakeshore370.py similarity index 100% rename from lakeshore370.py rename to labrad/servers/lakeshore370.py diff --git a/log_server.py b/labrad/servers/log_server.py similarity index 100% rename from log_server.py rename to labrad/servers/log_server.py diff --git a/microwave_switch.py b/labrad/servers/microwave_switch.py similarity index 99% rename from microwave_switch.py rename to labrad/servers/microwave_switch.py index 11392cfa..822d2dd0 100644 --- a/microwave_switch.py +++ b/labrad/servers/microwave_switch.py @@ -38,7 +38,7 @@ from labrad.errors import Error from labrad.types import Value from labrad.server import LabradServer, setting -import ghzdac.keys as keys +import labrad.servers.ghzdac.keys as keys from twisted.python import log from twisted.internet import defer from twisted.internet.defer import inlineCallbacks, returnValue diff --git a/mks_server.py b/labrad/servers/mks_server.py similarity index 100% rename from mks_server.py rename to labrad/servers/mks_server.py diff --git a/mks_server_devices.py b/labrad/servers/mks_server_devices.py similarity index 100% rename from mks_server_devices.py rename to labrad/servers/mks_server_devices.py diff --git a/http/modules/__init__.py b/labrad/servers/oscilloscope/__init__.py similarity index 100% rename from http/modules/__init__.py rename to labrad/servers/oscilloscope/__init__.py diff --git a/oscilloscope/agilent/DSO91304A.py b/labrad/servers/oscilloscope/agilent/DSO91304A.py similarity index 99% rename from oscilloscope/agilent/DSO91304A.py rename to labrad/servers/oscilloscope/agilent/DSO91304A.py index dbf20490..6081e87f 100644 --- a/oscilloscope/agilent/DSO91304A.py +++ b/labrad/servers/oscilloscope/agilent/DSO91304A.py @@ -6,7 +6,7 @@ from twisted.internet.defer import inlineCallbacks, returnValue import labrad.units as U -import oscilloscope.wrappers as wrappers +import labrad.servers.oscilloscope.wrappers as wrappers TRIGGER_MODES = [ diff --git a/oscilloscope/agilent/DSOX4104A.py b/labrad/servers/oscilloscope/agilent/DSOX4104A.py similarity index 99% rename from oscilloscope/agilent/DSOX4104A.py rename to labrad/servers/oscilloscope/agilent/DSOX4104A.py index d3eb4c32..5029ff61 100644 --- a/oscilloscope/agilent/DSOX4104A.py +++ b/labrad/servers/oscilloscope/agilent/DSOX4104A.py @@ -6,7 +6,7 @@ from twisted.internet.defer import inlineCallbacks, returnValue import labrad.units as U -import oscilloscope.wrappers as wrappers +import labrad.servers.oscilloscope.wrappers as wrappers class DSOX4104AWrapper(wrappers.OscilloscopeWrapper): diff --git a/oscilloscope/__init__.py b/labrad/servers/oscilloscope/agilent/__init__.py similarity index 100% rename from oscilloscope/__init__.py rename to labrad/servers/oscilloscope/agilent/__init__.py diff --git a/oscilloscope/server.py b/labrad/servers/oscilloscope/server.py similarity index 98% rename from oscilloscope/server.py rename to labrad/servers/oscilloscope/server.py index b347dfe9..332c56a8 100644 --- a/oscilloscope/server.py +++ b/labrad/servers/oscilloscope/server.py @@ -22,8 +22,8 @@ from labrad.gpib import GPIBManagedServer from labrad.server import setting -from oscilloscope.agilent.DSOX4104A import DSOX4104AWrapper -from oscilloscope.agilent.DSO91304A import DSO91304AWrapper +from labrad.servers.oscilloscope.agilent.DSOX4104A import DSOX4104AWrapper +from labrad.servers.oscilloscope.agilent.DSO91304A import DSO91304AWrapper class OscilloscopeServer(GPIBManagedServer): diff --git a/oscilloscope/wrappers.py b/labrad/servers/oscilloscope/wrappers.py similarity index 100% rename from oscilloscope/wrappers.py rename to labrad/servers/oscilloscope/wrappers.py diff --git a/resonatorFit.py b/labrad/servers/resonatorFit.py similarity index 100% rename from resonatorFit.py rename to labrad/servers/resonatorFit.py diff --git a/rfmux_server.py b/labrad/servers/rfmux_server.py similarity index 100% rename from rfmux_server.py rename to labrad/servers/rfmux_server.py diff --git a/sampling_scope.py b/labrad/servers/sampling_scope.py similarity index 100% rename from sampling_scope.py rename to labrad/servers/sampling_scope.py diff --git a/serial_server.py b/labrad/servers/serial_server.py similarity index 100% rename from serial_server.py rename to labrad/servers/serial_server.py diff --git a/spectrum_analyzer.py b/labrad/servers/spectrum_analyzer.py similarity index 100% rename from spectrum_analyzer.py rename to labrad/servers/spectrum_analyzer.py diff --git a/tektronix5104B.py b/labrad/servers/tektronix5104B.py similarity index 100% rename from tektronix5104B.py rename to labrad/servers/tektronix5104B.py diff --git a/tests/config_datavault.py b/labrad/servers/tests/config_datavault.py similarity index 100% rename from tests/config_datavault.py rename to labrad/servers/tests/config_datavault.py diff --git a/tests/test_datavault.py b/labrad/servers/tests/test_datavault.py similarity index 100% rename from tests/test_datavault.py rename to labrad/servers/tests/test_datavault.py diff --git a/tests/test_dv_backend.py b/labrad/servers/tests/test_dv_backend.py similarity index 90% rename from tests/test_dv_backend.py rename to labrad/servers/tests/test_dv_backend.py index 84d2f838..ef66b9bb 100644 --- a/tests/test_dv_backend.py +++ b/labrad/servers/tests/test_dv_backend.py @@ -1,7 +1,7 @@ from __future__ import absolute_import -import datavault.backend as backend -import datavault.util +from labrad.servers.datavault import backend +from labrad.servers.datavault import util import numpy as np import pytest import tempfile @@ -16,13 +16,13 @@ def test_create_ex_backend(): backend.Dependent(label='dlabel', legend='dlegend2', shape=[1], datatype='v', unit='')] dvfile = backend.create_backend(fname[:-5], "Test of datavault", indep, dep, extended=True) - rec_array = datavault.util.to_record_array(np.eye(4)) + rec_array = util.to_record_array(np.eye(4)) dvfile.addData(rec_array) rec_array_tr = np.core.records.fromarrays((np.ones(4)*1, np.ones(4)*2, np.ones(4)*3, np.ones(4)*4)) dvfile.addData(rec_array_tr) assert len(dvfile) == 8 data, newpos = dvfile.getData(limit=8, start=0, transpose=False, simpleOnly=True) - data = datavault.util.from_record_array(data) + data = util.from_record_array(data) ref_data = np.vstack((np.eye(4), np.array([np.ones(4)*1, np.ones(4)*2, np.ones(4)*3, np.ones(4)*4]).T)) assert np.array_equal(data, ref_data) finally: @@ -37,12 +37,12 @@ def test_create_simple_backend(): backend.Dependent(label='dlabel', legend='dlegend2', shape=[1], datatype='v', unit='')] dvfile = backend.create_backend(fname[:-5], "Test of datavault", indep, dep, extended=False) - rec_array = datavault.util.to_record_array(np.eye(4)) + rec_array = util.to_record_array(np.eye(4)) dvfile.addData(rec_array) rec_array_tr = np.core.records.fromarrays((np.ones(4)*1, np.ones(4)*2, np.ones(4)*3, np.ones(4)*4)) dvfile.addData(rec_array_tr) data, newpos = dvfile.getData(limit=8, start=0, transpose=False, simpleOnly=True) - data = datavault.util.from_record_array(data) + data = util.from_record_array(data) ref_data = np.vstack((np.eye(4), np.array([np.ones(4)*1, np.ones(4)*2, np.ones(4)*3, np.ones(4)*4]).T)) assert np.array_equal(data, ref_data) finally: @@ -60,7 +60,7 @@ def test_create_csv_backend(): dataset = backend.CsvNumpyData(csv_filename) dataset.initialize_info('test CSV dataset', indep, dep) dataset.save() - rec_array = datavault.util.to_record_array(np.eye(4)) + rec_array = util.to_record_array(np.eye(4)) dataset.addData(rec_array) rec_array_tr = np.core.records.fromarrays((np.ones(4)*1, np.ones(4)*2, np.ones(4)*3, np.ones(4)*4)) dataset.addData(rec_array_tr) @@ -68,7 +68,7 @@ def test_create_csv_backend(): del dataset dataset = backend.open_backend(csv_filename[:-4]) data, newpos = dataset.getData(limit=8, start=0, transpose=False, simpleOnly=True) - data = datavault.util.from_record_array(data) + data = util.from_record_array(data) ref_data = np.vstack((np.eye(4), np.array([np.ones(4)*1, np.ones(4)*2, np.ones(4)*3, np.ones(4)*4]).T)) assert np.array_equal(data, ref_data) assert os.path.exists(csv_filename) diff --git a/xyattenuators.py b/labrad/servers/xyattenuators.py similarity index 100% rename from xyattenuators.py rename to labrad/servers/xyattenuators.py diff --git a/oscilloscope/agilent/__init__.py b/oscilloscope/agilent/__init__.py deleted file mode 100644 index e69de29b..00000000