diff options
Diffstat (limited to 'eitControl.py')
| -rw-r--r-- | eitControl.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eitControl.py b/eitControl.py index 5347f7e..9c5aa93 100644 --- a/eitControl.py +++ b/eitControl.py @@ -22,7 +22,7 @@ class Experiment: def __init__(self, root): self.root = root self.tic = 0 - self.channelsNames2plot={'dac0', 'dac1', 'adc1', 'adc2', 'adc3', 'adc4'} + self.channelsNames2plot={'dac0', 'dac1', 'adc0', 'adc1', 'adc2', 'adc3'} self.xChannelName='tic' # can be also 'tic' or any of above self.xlabel='Frequency (Hz)' self.lines2plot={} @@ -94,10 +94,10 @@ class Experiment: self.data['x'] = [] self.data['dac0'] = [] self.data['dac1'] = [] + self.data['adc0'] = [] self.data['adc1'] = [] self.data['adc2'] = [] self.data['adc3'] = [] - self.data['adc4'] = [] def stop(self): self.sweeper.cmdStop() @@ -142,6 +142,11 @@ class Experiment: # daq0.setOutputCh(1, dac1) self.data['dac1'].append(dac1) + # adc0 + # adc0= daq0.getInputCh(0) + adc0 = SinGen(ampl=4, sweeper=swp).getValue() + self.data['adc0'].append( adc0 ) + # adc1 adc1= daq0.getInputCh(1) #adc1 = SinGen(ampl=1, sweeper=swp).getValue() @@ -157,11 +162,6 @@ class Experiment: adc3 = SinGen(ampl=3, sweeper=swp).getValue() self.data['adc3'].append( adc3 ) - # adc4 - # adc4= daq0.getInputCh(4) - adc4 = SinGen(ampl=4, sweeper=swp).getValue() - self.data['adc4'].append( adc4 ) - # X-axis (i.e. independent variable) # self.data['x'].append(tic) self.data['x']=self.data[self.xChannelName] |