From 7816078d6b18c74008c33a9fc21ac65e8969c2fa Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Tue, 29 Nov 2016 15:11:18 +0100 Subject: [PATCH] phaser/demo: update --- artiq/examples/phaser/repository/demo.py | 38 ++++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/artiq/examples/phaser/repository/demo.py b/artiq/examples/phaser/repository/demo.py index ba67b96a4..221016904 100644 --- a/artiq/examples/phaser/repository/demo.py +++ b/artiq/examples/phaser/repository/demo.py @@ -18,33 +18,33 @@ class SAWGTest(EnvExperiment): self.ttl_sma.output() while True: - self.sawg0.set_amplitude(0.) - self.sawg0.set_frequency(0*MHz) - self.sawg1.set_amplitude(0.) - self.sawg1.set_frequency(0*MHz) + self.sawg0.amplitude1.set(0.) + self.sawg0.frequency0.set(0*MHz) + self.sawg1.amplitude1.set(0.) + self.sawg1.frequency0.set(0*MHz) delay(20*ms) - self.sawg0.set_amplitude(.4) - self.sawg0.set_frequency(10*MHz) - self.sawg0.set_phase(0.) - self.sawg1.set_amplitude(.4) - self.sawg1.set_frequency(10*MHz) - self.sawg1.set_phase(0.) + self.sawg0.amplitude1.set(.4) + self.sawg0.frequency0.set(10*MHz) + self.sawg0.phase0.set(0.) + self.sawg1.amplitude1.set(.4) + self.sawg1.frequency0.set(10*MHz) + self.sawg1.phase0.set(0.) self.ttl_sma.pulse(200*ns) - self.sawg1.set_amplitude(.1) + self.sawg1.amplitude1.set(.1) delay(200*ns) - self.sawg1.set_amplitude(-.4) + self.sawg1.amplitude1.set(-.4) self.ttl_sma.pulse(200*ns) - self.sawg1.set_amplitude(.4) + self.sawg1.amplitude1.set(.4) delay(200*ns) - self.sawg1.set_phase(.25) + self.sawg1.phase0.set(.25) self.ttl_sma.pulse(200*ns) - self.sawg1.set_phase(.5) + self.sawg1.phase0.set(.5) delay(200*ns) - self.sawg0.set_phase(.5) + self.sawg0.phase0.set(.5) self.ttl_sma.pulse(200*ns) - self.sawg1.set_frequency(30*MHz) + self.sawg1.frequency0.set(30*MHz) delay(200*ns) - self.sawg1.set_frequency(10*MHz) - self.sawg1.set_phase(0.) + self.sawg1.frequency0.set(10*MHz) + self.sawg1.phase0.set(0.) self.ttl_sma.pulse(200*ns)