Commit 3b52886c authored by Jason Milhone's avatar Jason Milhone
Browse files

Fixes for mach probe in PiScope and PCX config file

parent 097ebea4
[setup]
col = 2, 2, 2, 2, 0, 0
event = raw_data_ready
server = 192.168.0.4
tree = pcx_proc
[00]
ylabel = $10^{18}$ m${}^{-3}$
legend = True
xlabel = ""
[[tp1]]
y = density.tp1 / 1e18
x = dim_of(density.tp1)
color = "#1f77b4"
[[tp2]]
y = density.tp2/1e18
x = dim_of(density.tp2)
color = "#ff7f0e"
[[nn]]
x = dim_of(neut_density.ccg1)
y = neut_density.ccg1/1e18
color = "#2ca02c"
[10]
ylabel = V
legend = True
xlabel = ""
[[BAPS1]]
y = disch_volt.cathode0
x = dim_of(disch_volt.cathode0)
color = "#1f77b4"
[[BAPS2]]
y = aux_lem.aux_lem_2
x = dim_of(aux_lem.aux_lem_2)
color = "#ff7f0e"
[[A0_GND]]
x = dim_of(aux_lem.aux_lem_3)
y = aux_lem.aux_lem_3
color = "#2ca02c"
[01]
ylabel = eV
legend = True
[[tp1]]
y = te.tp1
x = dim_of(te.tp1)
color = "#1f77b4"
[[tp2]]
y = te.tp2
x = dim_of(te.tp2)
color = "#ff7f0e"
[11]
ylabel = A
legend = True
[[C0_BAPS1]]
x = dim_of(disch_curr.cathode0)
y = disch_curr.cathode0
color = "#9467bd"
[[C1_BAPS2]]
x = dim_of(aux_lem.aux_lem_4)
y = aux_lem.aux_lem_4
color = "#1f77b4"
[[A0]]
x = dim_of(disch_curr.anode0)
y = disch_curr.anode0
color = "#1f77b4"
[02]
ylabel = V
legend = True
[[tp1]]
x = dim_of( vfloat.tp1)
y = vfloat.tp1
color = "#1f77b4"
[[tp2]]
x = dim_of(vfloat.tp2)
y = vfloat.tp2
color = "#ff7f0e"
[[Vp]]
x = dim_of(vplasma.tp1)
y = vplasma.tp1
color = "#2ca02c"
[12]
ylabel = A
legend = True
[[C1]]
x = dim_of(disch_curr.cathode1)
y = disch_curr.cathode1
color = "#8c564b"
[[C2]]
x = dim_of(disch_curr.cathode2)
y = disch_curr.cathode2
color = "#e377c2"
[[C3]]
x = dim_of(disch_curr.cathode3)
y = disch_curr.cathode3
color = "#7f7f7f"
[[C4]]
x = dim_of(disch_curr.cathode4)
y = disch_curr.cathode4
color = "#bcbd22"
[[GND]]
x = dim_of(aux_lem.aux_lem_1)
y = aux_lem.aux_lem_1
color = "#17becf"
[[A1]]
x = dim_of(disch_curr.anode1)
y = disch_curr.anode1
color = "#1f77b4"
[[A2]]
x = dim_of(disch_curr.anode2)
y = disch_curr.anode2
color = "#ff7f0e"
[[A3]]
x = dim_of(disch_curr.anode3)
y = disch_curr.anode3
color = "#2ca02c"
[[A4]]
x = dim_of(disch_curr.anode4)
y = disch_curr.anode4
color = "#d62728"
[[A5]]
x = dim_of(disch_curr.anode5)
y = disch_curr.anode5
color = "#9467bd"
[03]
ylabel = A
legend = True
[[MP1A]]
x = dim_of(mach_curr.mp1)
y = DATA(mach_curr.mp1[*, 0])
color = "#1f77b4"
[[MP1B]]
x = dim_of(mach_curr.mp1)
y = data(mach_curr.mp1[*, 1])
color = "#ff7f0e"
[13]
ylabel = kW
legend = True
[[BAPS1]]
x = dim_of(disch_curr.cathode0)
y = -disch_volt.cathode0 * disch_curr.cathode0 * 0.001
color = "#1f77b4"
[[BAPS2]]
x = dim_of(aux_lem.aux_lem_2)
y = aux_lem.aux_lem_2*(data(disch_curr.cathode1)+data(disch_curr.cathode2)+data(disch_curr.cathode3)+data(disch_curr.cathode4)+data(aux_lem.aux_lem_4))*0.001
color = "#ff7f0e"
......@@ -83,7 +83,9 @@ def retrieve_signal(shot_number, signal_info, loc_name, signal_name, server, tre
xstring = signal_info['x']
ystring = signal_info['y']
color = signal_info['color']
if isinstance(ystring, list):
ystring = ','.join(ystring)
#print(type(shot_number), type(server), type(tree), type(xstring), type(ystring), type(signal_name), type(color), ystring)
data = _retrieve_signal(shot_number, server, tree, xstring, ystring,
signal_name, color)
return data
......@@ -136,7 +138,7 @@ def retrieve_data(connection, xstr, ystr, name, color):
xstring = " ".join(xstring)
else:
xstring = xstr
print(ystring)
data = connection.get(ystring)
t = connection.get(xstring)
......@@ -155,6 +157,9 @@ def retrieve_data(connection, xstr, ystr, name, color):
except mds.TreeNODATA:
logger.warning('TreeNODATA occurred in retrieve_data for %s' % name)
return
except mds.TreeNNF:
logger.warning('TreeNNF occurred in retrieve_data for %s' % name)
return
except KeyError:
logger.warning('KeyError occured in retrieve_data for %s' % name)
return
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment