This commit is contained in:
gac-x11ma
2020-12-16 10:44:45 +01:00
parent b707f89f2b
commit 7416ba9d0f
5 changed files with 450 additions and 299 deletions
+8 -4
View File
@@ -26,14 +26,14 @@ diag_channels_names = { \
#"id1 offset": "X11MA-ID1:ENERGY-OFFS", \
#"id1 alpha": "X11MA-ID1:ALPHA", \
#"id1 harmonic": "X11MA-ID1:HARMONIC", \
"id1 gap": "X11MA-ID1-GAP:READ", \
"id1 shift": "X11MA-ID1-SHIFT:READ", \
#"id1 gap": "X11MA-ID1-GAP:READ", \
#"id1 shift": "X11MA-ID1-SHIFT:READ", \
#"id2 mode": "X11MA-ID2:MODE", \
#"id2 offset": "X11MA-ID2:ENERGY-OFFS", \
#"id2 alpha": "X11MA-ID2:ALPHA", \
#"id2 harmonic": "X11MA-ID2:HARMONIC", \
"id2 gap": "X11MA-ID2-GAP:READ", \
"id2 shift": "X11MA-ID2-SHIFT:READ", \
#"id2 gap": "X11MA-ID2-GAP:READ", \
#"id2 shift": "X11MA-ID2-SHIFT:READ", \
"keithley 10 IO": "X11Keithley1-read", \
#"ring current": "ARIDI-PCT:CURRENT", \
#"PEEM high voltage": "X11MA-ES1-PEEM:UMON", \
@@ -77,10 +77,14 @@ diag_devices = {
"id1 offset": id1_offset, \
"id1 alpha": id1_alpha, \
"id1 harmonic": id1_harmonic, \
"id1 gap": id1_gap, \
"id1 shift": id1_shift, \
"id2 mode": id2_mode, \
"id2 offset": id2_offset, \
"id2 alpha": id2_alpha, \
"id2 harmonic": id2_harmonic, \
"id2 gap": id2_gap, \
"id2 shift": id2_shift, \
"ring current": machine_cur, \
"PEEM high voltage": microscope.high_voltage,
}