diff options
| author | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2021-06-12 17:45:21 -0400 |
|---|---|---|
| committer | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2021-06-12 17:45:58 -0400 |
| commit | e6ef3ba45d318cb6df6b46202068fdbe0a043e87 (patch) | |
| tree | 39e202c28d65be700bea1fdf12cdbd907643178c /eitControl.py | |
| parent | 9fca5d9a397ed493da01be151e7a89d0e69d001c (diff) | |
| download | pyExpControl-e6ef3ba45d318cb6df6b46202068fdbe0a043e87.tar.gz pyExpControl-e6ef3ba45d318cb6df6b46202068fdbe0a043e87.zip | |
a more intellegent dummy LabJack
Diffstat (limited to 'eitControl.py')
| -rw-r--r-- | eitControl.py | 4 |
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() |