diff options
| -rw-r--r-- | eitControl.py | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/eitControl.py b/eitControl.py index 2c637e3..514c7e3 100644 --- a/eitControl.py +++ b/eitControl.py @@ -321,25 +321,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() - self.data['adc1'].append( adc1 ) - - # adc2 - adc2= daq0.getInputCh(2) - # adc2 = SinGen(ampl=2, sweeper=swp).getValue() - self.data['adc2'].append( adc2 ) - - # adc3 - adc3= daq0.getInputCh(3) - # adc3 = SinGen(ampl=3, sweeper=swp).getValue() - self.data['adc3'].append( adc3 ) + for ch in self.config['DAQ']: + if ch[0:3] == 'ain': + n=int(ch[3:]) + vIn = daq0.getInputCh(n) + self.data[ch].append( vIn ) # X-axis (i.e. independent variable) x=self.data[self.xChannelName] |