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

@ -9,22 +9,22 @@ def experiment(): # Jeener-Broekaert sequence with solid-echo detection to measu
# set up acquisition parameters:
pars = {}
pars['P90'] = 2.3e-6 # 90-degree pulse length (s)
pars['P90'] = 4.2e-6 # 90-degree pulse length (s)
pars['SF'] = 46.7e6 # spectrometer frequency (Hz)
pars['O1'] = 5.6e3 # offset from SF (Hz)
pars['SW'] = 200e3 # spectrum width (Hz)
pars['SI'] = 1*256 # number of acquisition points
pars['NS'] = 32 # number of scans
pars['NS'] = 16 # number of scans
pars['DS'] = 0 # number of dummy scans
pars['RD'] = .5 # delay between scans (s)
pars['D1'] = 30e-6 # delay after first pulse or 'short tau' (s)
pars['D2'] = 30e-6 # delay after second pulse or 'long tau' (s)
pars['PHA'] = -27 # receiver phase (degree)
pars['D2'] = 30e-1 # delay after second pulse or 'long tau' (s)
pars['PHA'] = -40 # receiver phase (degree)
pars['DATADIR'] = '/home/fprak/Students/' # data directory
pars['OUTFILE'] = None # output file name
# specify a variable parameter (optional):
pars['VAR_PAR'] = 'D2' # variable parameter name (a string)
pars['VAR_PAR'] = None#'D2' # variable parameter name (a string)
start = 30e-6 # starting value
stop = 2e-0 # end value
steps = 16 # number of values
@ -109,7 +109,6 @@ def t1q_experiment(pars, run):
pars['PH5'] = [0, 0, 180, 180, 270, 90, 90, 270] # refocucing 90-deg pulse
pars['PH2'] = [0, 180, 0, 180, 180, 0, 180, 0] # receiver
# read in variables:
P90 = pars['P90']
P45 = pars['P90']*0.5
@ -124,6 +123,9 @@ def t1q_experiment(pars, run):
PH5 = pars['PH5'][run%len(pars['PH5'])]
PH2 = pars['PH2'][run%len(pars['PH2'])]
PHA = pars['PHA']
if (run/8)%2 != 0:
PH5 += 180
# set sampling parameters:
SI = pars['SI']
@ -138,13 +140,13 @@ def t1q_experiment(pars, run):
e.ttl_pulse(TXEnableDelay, value=TXEnableValue)
e.ttl_pulse(P90, value=TXEnableValue|TXPulseValue) # 90-degree pulse
e.wait(D1-P90/2-TXEnableDelay) # 'short tau'
e.wait(D1-P90/2-P45/2-TXEnableDelay) # 'short tau'
e.set_phase(PH3)
e.ttl_pulse(TXEnableDelay, value=TXEnableValue)
e.ttl_pulse(P45, value=TXEnableValue|TXPulseValue) # 45-degree pulse
e.wait(D2-P45/2-TXEnableDelay) # 'long tau'
e.wait(D2-P45-TXEnableDelay) # 'long tau'
e.set_phase(PH4)
e.ttl_pulse(TXEnableDelay, value=TXEnableValue)
@ -157,7 +159,7 @@ def t1q_experiment(pars, run):
e.ttl_pulse(P90, value=TXEnableValue|TXPulseValue) # 90-degree pulse
e.set_phase(PHA)
e.wait(13e-6)
e.wait(12e-6)
e.record(SI, SW, sensitivity=ADCSensitivity) # acquisition
# write experiment attributes: