diff options
Diffstat (limited to 'eitControl.py')
| -rw-r--r-- | eitControl.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/eitControl.py b/eitControl.py index 41ee265..5347f7e 100644 --- a/eitControl.py +++ b/eitControl.py @@ -23,7 +23,7 @@ class Experiment: self.root = root self.tic = 0 self.channelsNames2plot={'dac0', 'dac1', 'adc1', 'adc2', 'adc3', 'adc4'} - self.xChannelName='dac0' # can be also 'tic' or any of above + self.xChannelName='tic' # can be also 'tic' or any of above self.xlabel='Frequency (Hz)' self.lines2plot={} self.clearData() @@ -31,7 +31,7 @@ class Experiment: self.guiSweeper = Sweeper(self.root, Npoints=2, SweepTime=1, onTicCallbacks=[self.updatePlot]) self.guiSweeper.cmdStart() self.hardware = {} - # self.hardwareSetup() + self.hardwareSetup() self.sweeper = Sweeper(self.root, Npoints=100, SweepTime=1, onTicCallbacks=[self.onTic]) # self.funcGen = SinGen(2, 2, sweeper = self.sweeper) # self.funcGen = RampGen(0, 5, sweeper = self.sweeper) @@ -130,21 +130,21 @@ class Experiment: self.data['tic'].append(tic) # DAQ - # daq0 = self.hardware['LabJack'] + daq0 = self.hardware['LabJack'] # dac0 dac0 = self.funcGen.getValue(swp) - # daq0.setOutputCh(0, out0) + daq0.setOutputCh(0, dac0) self.data['dac0'].append(dac0) # dac1 dac1 = PulseGen(ampl=5, sweeper=swp).getValue() - # daq0.setOutputCh(0, dac1) + # daq0.setOutputCh(1, dac1) self.data['dac1'].append(dac1) # adc1 - # adc1= daq0.getInputCh(1) - adc1 = SinGen(ampl=1, sweeper=swp).getValue() + adc1= daq0.getInputCh(1) + #adc1 = SinGen(ampl=1, sweeper=swp).getValue() self.data['adc1'].append( adc1 ) # adc2 @@ -198,7 +198,7 @@ class Experiment: ln.set_data(x, y) self.ax.draw_artist(ln) # self.canvas.update() - # self.canvas.draw() + self.canvas.draw() self.fig.canvas.flush_events() stop = datetime.now() runTime = (stop-start).seconds + float((stop-start).microseconds)/1000000 |