incorprated changes since August

This commit is contained in:
Oleg Petrov
2015-09-30 11:23:17 +00:00
parent d9beb94422
commit 4ec93a212b
12 changed files with 65 additions and 55 deletions

View File

@ -130,7 +130,7 @@ def solidecho_experiment(pars, run):
e.set_frequency(SF+O1, phase=PH1) # set frequency and phase for 1st RF pulse
e.ttl_pulse(TXEnableDelay, value=TXEnableValue) # enable RF amplifier
e.ttl_pulse(P90, value=TXEnableValue|TXPulseValue) # apply 1st 90-degree pulse
e.wait(TAU-P90/2-TXEnableDelay) # wait for TAU
e.wait(TAU-P90-TXEnableDelay) # wait for TAU
e.set_phase(PH3) # set phase for 2nd 90-degree pulse
e.ttl_pulse(TXEnableDelay, value=TXEnableValue) # enalble RF amplifier
e.ttl_pulse(P90, value=TXEnableValue|TXPulseValue) # apply 2nd 90-degree pulse
@ -144,4 +144,4 @@ def solidecho_experiment(pars, run):
e.set_description('run', run) # current scan
e.set_description('rec_phase', -PH2) # current receiver phase
return e
return e