diff options
Diffstat (limited to 'eitControl.py')
| -rw-r--r-- | eitControl.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/eitControl.py b/eitControl.py index eedcead..477dd15 100644 --- a/eitControl.py +++ b/eitControl.py @@ -149,33 +149,36 @@ class Experiment: daq0 = self.hardware['LabJack'] # dac0 + # dac0 = self.funcGen.getValue(swp) + dac0 = 0 dac0 = self.funcGen.getValue(swp) daq0.setOutputCh(0, dac0) self.data['dac0'].append(dac0) # dac1 - dac1 = PulseGen(ampl=5, sweeper=swp).getValue() - # daq0.setOutputCh(1, dac1) + # dac1 = PulseGen(ampl=5, sweeper=swp).getValue() + dac1 = 0 + daq0.setOutputCh(1, dac1) self.data['dac1'].append(dac1) # adc0 - # adc0= daq0.getInputCh(0) - adc0 = SinGen(ampl=4, sweeper=swp).getValue() + 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() + # adc1 = SinGen(ampl=1, sweeper=swp).getValue() self.data['adc1'].append( adc1 ) # adc2 - # adc2= daq0.getInputCh(2) - adc2 = SinGen(ampl=2, sweeper=swp).getValue() + 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() + adc3= daq0.getInputCh(3) + # adc3 = SinGen(ampl=3, sweeper=swp).getValue() self.data['adc3'].append( adc3 ) # X-axis (i.e. independent variable) |