aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eitControl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/eitControl.py b/eitControl.py
index d4ae123..8938f8b 100644
--- a/eitControl.py
+++ b/eitControl.py
@@ -39,7 +39,6 @@ class Experiment:
self.guiSweeper = Sweeper(self.root, Npoints=2, SweepTime=1, onTicCallbacks=[self.updatePlot])
self.guiSweeper.cmdStart()
self.hardware = {}
- self.hardwareSetup(args)
self.sweeper = Sweeper(self.root, Npoints=100, SweepTime=10, onTicCallbacks=[self.onTic])
# self.funcGen = SinGen(2, 2, sweeper = self.sweeper)
# self.funcGen = RampGen(0, 5, sweeper = self.sweeper)
@@ -49,12 +48,13 @@ class Experiment:
fSpan=50e3
self.fSpan=fSpan
self.rfGenFunc = RampGen(fCent-fSpan/2, fCent+fSpan/2, sweeper = self.sweeper)
+ self.hardwareSetup(args)
def hardwareSetup(self,args):
if args.test:
print("Test mode, run with fake hardware")
- self.hardware['LabJack'] = ue9qol.UE9qolDummy()
+ self.hardware['LabJack'] = ue9qol.UE9qolDummy(sweeper=self.sweeper)
self.hardware['rfGen'] = rfGen.rfGenLMX2487Dummy(port='/dev/ttyUSB0', speed=115200, timeout=1)
else:
self.hardware['LabJack'] = ue9qol.UE9qol()