Move code into labrad.servers package

ADR/magnet_controller.py → 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')

Fit Server/fit_server.py → 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

Fit Server/fit_squid_steps.py → 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)
 

Fit Server/fit_step_edge.py → 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):

GHzDACs/dac_emulator.py → 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']
 

GUIs/ADR/ADRcontrol.py → 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
 

GUIs/ADR/ADRcontrol2.py → 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

Simulations/circuit_simulator.py → 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'

Simulations/circuitsim.py → 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

labrad/servers/__init__.py

@@ -0,0 +1,2 @@
+from pkgutil import extend_path
+__path__ = extend_path(__path__, __name__)

dac_calibration_server.py → 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):

data_vault.py → 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