From 2b05ecd0b7f8ac8fb8ac5b4919a1f55b41b03b54 Mon Sep 17 00:00:00 2001 From: Oleg Petrov Date: Wed, 30 Sep 2015 12:13:20 +0000 Subject: [PATCH] --- AU_Programs/2H/op_2h_exp.py | 10 +++++----- AU_Programs/2H/op_2h_res.py | 3 ++- AU_Programs/Diffusiometry/op_diff_exp.py | 8 ++++---- AU_Programs/Diffusiometry/op_diff_res.py | 3 ++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/AU_Programs/2H/op_2h_exp.py b/AU_Programs/2H/op_2h_exp.py index 53d89ed..d39b27c 100644 --- a/AU_Programs/2H/op_2h_exp.py +++ b/AU_Programs/2H/op_2h_exp.py @@ -7,11 +7,11 @@ ADCSensitivity = 1 # voltage span for ADC def experiment(): # drives four experiments in a row: saturation-recovery, solid echo, spin-alignment, and Zeeman-order - # experiment toggles: - satrec2_flag = True # saturation-recovery on/off - solidecho_flag = True # solid-echo on/off - spinal_flag = True # spin-alignment on/off - zeeman_flag = False # Zeeman-order on/off + # experiments on/off: + satrec2_flag = True # toggle for saturation-recovery + solidecho_flag = True # toggle for solid-echo + spinal_flag = True # toggle for spin-alignment + zeeman_flag = False # toggle for Zeeman-order # ------------------ Saturation-recovery experiment settings ---------------------- diff --git a/AU_Programs/2H/op_2h_res.py b/AU_Programs/2H/op_2h_res.py index 4e9acdb..ddfe651 100644 --- a/AU_Programs/2H/op_2h_res.py +++ b/AU_Programs/2H/op_2h_res.py @@ -8,6 +8,7 @@ from os import path, rename def result(): the_experiment = None # current experiment's name + var_key = '' measurements = {'satrec2_experiment': MeasurementResult('Saturation Recovery'), 'solidecho_experiment': MeasurementResult('Solid Echo'), @@ -142,7 +143,7 @@ def result(): counter += 1 else: - print "Cannot recognize experiment: continue without measuring" + print "Cannot recognize experiment: accumulate without measuring" # save accu if required: outfile = pars.get('OUTFILE') diff --git a/AU_Programs/Diffusiometry/op_diff_exp.py b/AU_Programs/Diffusiometry/op_diff_exp.py index 511626a..aa76f68 100644 --- a/AU_Programs/Diffusiometry/op_diff_exp.py +++ b/AU_Programs/Diffusiometry/op_diff_exp.py @@ -7,10 +7,10 @@ ADCSensitivity = 1 # voltage span for ADC def experiment(): # drives three experiments in a row: saturation-recovery, stimulated echo, and Hanh echo - # experiments switches: - satrec2_flag = True # saturation-recovery switch - ste_flag = True # stimulated-echo switch - hahn_flag = False # Hahn-echo switch + # experiments on/off: + satrec2_flag = True # toggle for saturation-recovery + ste_flag = True # toggle for stimulated-echo + hahn_flag = False # toggle for Hahn-echo # ------------------ Saturation-recovery experiment settings ---------------------- diff --git a/AU_Programs/Diffusiometry/op_diff_res.py b/AU_Programs/Diffusiometry/op_diff_res.py index 48858e4..43f50f0 100644 --- a/AU_Programs/Diffusiometry/op_diff_res.py +++ b/AU_Programs/Diffusiometry/op_diff_res.py @@ -8,6 +8,7 @@ from os import path, rename def result(): the_experiment = None # current experiment's name + var_key = '' measurements = {'satrec2_experiment': MeasurementResult('Saturation Recovery'), 'ste_experiment': MeasurementResult('Stimulated Echo'), @@ -140,7 +141,7 @@ def result(): counter += 1 else: - print "Cannot recognize experiment: continue without measuring" + print "Cannot recognize experiment: accumulate without measuring" # save accu if required: outfile = pars.get('OUTFILE')