This commit is contained in:
		| @@ -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 | def experiment(): # drives four experiments in a row: saturation-recovery, solid echo, spin-alignment, and Zeeman-order | ||||||
|  |  | ||||||
|     # experiment toggles:  |     # experiments on/off:  | ||||||
|     satrec2_flag = True     # saturation-recovery on/off |     satrec2_flag = True     # toggle for saturation-recovery | ||||||
|     solidecho_flag = True   # solid-echo on/off |     solidecho_flag = True   # toggle for solid-echo | ||||||
|     spinal_flag = True      # spin-alignment on/off |     spinal_flag = True      # toggle for spin-alignment | ||||||
|     zeeman_flag = False     # Zeeman-order on/off |     zeeman_flag = False     # toggle for Zeeman-order | ||||||
|  |  | ||||||
|  |  | ||||||
| # ------------------ Saturation-recovery experiment settings ---------------------- | # ------------------ Saturation-recovery experiment settings ---------------------- | ||||||
|   | |||||||
| @@ -8,6 +8,7 @@ from os import path, rename | |||||||
| def result(): | def result(): | ||||||
|  |  | ||||||
|     the_experiment = None	# current experiment's name |     the_experiment = None	# current experiment's name | ||||||
|  |     var_key = '' | ||||||
|      |      | ||||||
|     measurements = {'satrec2_experiment': MeasurementResult('Saturation Recovery'), |     measurements = {'satrec2_experiment': MeasurementResult('Saturation Recovery'), | ||||||
|                   'solidecho_experiment': MeasurementResult('Solid Echo'), |                   'solidecho_experiment': MeasurementResult('Solid Echo'), | ||||||
| @@ -142,7 +143,7 @@ def result(): | |||||||
|                     counter += 1 |                     counter += 1 | ||||||
| 					 | 					 | ||||||
|                 else:  |                 else:  | ||||||
|                     print "Cannot recognize experiment: continue without measuring"				 |                     print "Cannot recognize experiment: accumulate without measuring"				 | ||||||
|  |  | ||||||
|             # save accu if required:    |             # save accu if required:    | ||||||
|             outfile = pars.get('OUTFILE') |             outfile = pars.get('OUTFILE') | ||||||
|   | |||||||
| @@ -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 | def experiment(): # drives three experiments in a row: saturation-recovery, stimulated echo, and Hanh echo | ||||||
|  |  | ||||||
|     # experiments switches:  |     # experiments on/off:  | ||||||
|     satrec2_flag = True     # saturation-recovery switch |     satrec2_flag = True     # toggle for saturation-recovery | ||||||
|     ste_flag = True         # stimulated-echo switch |     ste_flag = True         # toggle for stimulated-echo | ||||||
|     hahn_flag = False       # Hahn-echo switch |     hahn_flag = False       # toggle for Hahn-echo  | ||||||
|  |  | ||||||
|  |  | ||||||
| # ------------------ Saturation-recovery experiment settings ---------------------- | # ------------------ Saturation-recovery experiment settings ---------------------- | ||||||
|   | |||||||
| @@ -8,6 +8,7 @@ from os import path, rename | |||||||
| def result(): | def result(): | ||||||
|  |  | ||||||
|     the_experiment = None	# current experiment's name |     the_experiment = None	# current experiment's name | ||||||
|  |     var_key = '' | ||||||
|      |      | ||||||
|     measurements = {'satrec2_experiment': MeasurementResult('Saturation Recovery'), |     measurements = {'satrec2_experiment': MeasurementResult('Saturation Recovery'), | ||||||
|                         'ste_experiment': MeasurementResult('Stimulated Echo'), |                         'ste_experiment': MeasurementResult('Stimulated Echo'), | ||||||
| @@ -140,7 +141,7 @@ def result(): | |||||||
|                     counter += 1 |                     counter += 1 | ||||||
| 					 | 					 | ||||||
|                 else:  |                 else:  | ||||||
|                     print "Cannot recognize experiment: continue without measuring"				 |                     print "Cannot recognize experiment: accumulate without measuring"				 | ||||||
|  |  | ||||||
|             # save accu if required:    |             # save accu if required:    | ||||||
|             outfile = pars.get('OUTFILE') |             outfile = pars.get('OUTFILE') | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user