Skip to content

Commit 7ff854a

Browse files
adam-parker1adam-parker1
committed
Update summary IDS mappings for JET to reflect 3.42 and work on the JDC uda box
1 parent 9a69e55 commit 7ff854a

4 files changed

Lines changed: 87 additions & 46 deletions

File tree

‎mappings/globals.json‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,9 @@
11
{
2-
"COMMENT_1": "Top-level globals.json, relevant variables to all IDSs. Includes all templating substitutions",
3-
"COMMENT_2": "PLUGIN_ARGS defines the mandatory arguments for each plugin request",
4-
"DEG2RAD": 0.0174532925199,
5-
"UNIT_SF": 1000,
62
"PLUGIN_CONFIG": {
7-
"JETCPF_Reader": {
3+
"JET_CPF": {
84
"ARGS": {
9-
"shot": "{{ pulse }}",
10-
"datatype": "{{ datatype }}",
11-
"rank": "{{ rank }}"
5+
"pulse": "{{ shot }}"
126
}
13-
},
14-
"MDSPLUS": {
15-
"ARGS": {
16-
"shot": "{{ pulse }}",
17-
"datatype": "{{ datatype }}",
18-
"rank": "{{ rank }}",
19-
"host": "mdsplus.jetdata.eu",
20-
"port": "8000"
21-
},
22-
"FUNCTION": "read"
237
}
248
}
259
}

‎mappings/mappings.cfg.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2-
"3.37": ["summary", "magnetics", "thomson_scattering", "wall"],
2+
"3.42.0": ["summary"],
3+
"3.37": ["summary"],
34
"3.34": ["pf_active"]
45
}

‎mappings/summary/globals.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"COMMENT1": "Global variables unique to the SUMMARY IDS needed for templating"
2+
"UNIT_SF": 1000,
3+
"DEG2RAD": "0.01745329"
34
}

‎mappings/summary/mappings.json‎

Lines changed: 81 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,150 @@
11
{
22
"ids_properties/homogeneous_time": {
33
"MAP_TYPE": "VALUE",
4-
"VALUE": 2
4+
"VALUE": 1
55
},
6-
"global_quantities/ip": {
6+
"time": {
77
"MAP_TYPE": "PLUGIN",
8-
"PLUGIN": "JETCPF_Reader",
8+
"PLUGIN": "JET_CPF",
9+
"ARGS": {
10+
"signal": "time"
11+
}
12+
},
13+
"global_quantities/ip/value": {
14+
"MAP_TYPE": "PLUGIN",
15+
"PLUGIN": "JET_CPF",
916
"ARGS": {
1017
"signal": "MAGN/IPLA"
1118
}
1219
},
13-
"global_quantities/r0": {
20+
"global_quantities/ip/source": {
21+
"MAP_TYPE": "VALUE",
22+
"VALUE": "CPF:MAGN/IPLA"
23+
},
24+
"global_quantities/r0/value": {
1425
"MAP_TYPE": "VALUE",
1526
"VALUE": 2.96
1627
},
17-
"global_quantities/b0": {
28+
"global_quantities/b0/value": {
1829
"MAP_TYPE": "PLUGIN",
19-
"PLUGIN": "JETCPF_Reader",
30+
"PLUGIN": "JET_CPF",
2031
"ARGS": {
2132
"signal": "MAGN/BVAC"
2233
}
2334
},
24-
"global_quantities/q_95": {
35+
"global_quantities/b0/source": {
36+
"MAP_TYPE": "VALUE",
37+
"VALUE": "CPF:MAGN/BVAC"
38+
},
39+
"global_quantities/q_95/value": {
2540
"MAP_TYPE": "PLUGIN",
26-
"PLUGIN": "JETCPF_Reader",
41+
"PLUGIN": "JET_CPF",
2742
"ARGS": {
2843
"signal": "EFIT/Q95"
2944
}
3045
},
31-
"global_quantities/power_ohm": {
46+
"global_quantities/q_95/source": {
47+
"MAP_TYPE": "VALUE",
48+
"VALUE": "CPF:EFIT/Q95"
49+
},
50+
"global_quantities/power_ohm/value": {
3251
"MAP_TYPE": "PLUGIN",
33-
"PLUGIN": "JETCPF_Reader",
52+
"PLUGIN": "JET_CPF",
3453
"ARGS": {
3554
"signal": "EFIT/POHM"
3655
}
3756
},
38-
"boundary/elongation": {
57+
"global_quantities/power_ohm/source": {
58+
"MAP_TYPE": "VALUE",
59+
"VALUE": "CPF:EFIT/POHM"
60+
},
61+
"boundary/elongation/value": {
3962
"MAP_TYPE": "PLUGIN",
40-
"PLUGIN": "JETCPF_Reader",
63+
"PLUGIN": "JET_CPF",
4164
"ARGS": {
4265
"signal": "EFIT/ELON"
4366
}
4467
},
45-
"boundary/triangularity_upper": {
68+
"boundary/elongation/source": {
69+
"MAP_TYPE": "VALUE",
70+
"VALUE": "CPF:EFIT/ELON"
71+
},
72+
"boundary/triangularity_upper/value": {
4673
"MAP_TYPE": "PLUGIN",
47-
"PLUGIN": "JETCPF_Reader",
74+
"PLUGIN": "JET_CPF",
4875
"ARGS": {
4976
"signal": "EFIT/TRIU"
5077
}
5178
},
52-
"boundary/triangularity_lower": {
79+
"boundary/triangularity_upper/source": {
80+
"MAP_TYPE": "VALUE",
81+
"VALUE": "CPF:EFIT/TRIU"
82+
},
83+
"boundary/triangularity_lower/value": {
5384
"MAP_TYPE": "PLUGIN",
54-
"PLUGIN": "JETCPF_Reader",
85+
"PLUGIN": "JET_CPF",
5586
"ARGS": {
5687
"signal": "EFIT/TRIL"
5788
}
5889
},
59-
"local/magnetics_axis/n_e": {
90+
"boundary/triangularity_lower/source": {
91+
"MAP_TYPE": "VALUE",
92+
"VALUE": "CPF:EFIT/TRIL"
93+
},
94+
"local/magnetic_axis/n_e/value": {
6095
"MAP_TYPE": "PLUGIN",
61-
"PLUGIN": "JETCPF_Reader",
96+
"PLUGIN": "JET_CPF",
6297
"ARGS": {
6398
"signal": "HRTX/NE0"
6499
}
65100
},
66-
"local/magnetics_axis/t_e": {
101+
"local/magnetic_axis/n_e/source": {
102+
"MAP_TYPE": "VALUE",
103+
"VALUE": "CPF:HRTX/NE0"
104+
},
105+
"local/magnetic_axis/t_e/value": {
67106
"MAP_TYPE": "PLUGIN",
68-
"PLUGIN": "JETCPF_Reader",
107+
"PLUGIN": "JET_CPF",
69108
"ARGS": {
70109
"signal": "HRTX/TE0"
71110
}
72111
},
73-
"_local/magnetics_axis/p_e": {
112+
"local/magnetic_axis/t_e/source": {
113+
"MAP_TYPE": "VALUE",
114+
"VALUE": "CPF:HRTX/TE0"
115+
},
116+
"_local/magnetic_axis/p_e/value": {
74117
"MAP_TYPE": "PLUGIN",
75-
"PLUGIN": "JETCPF_Reader",
118+
"PLUGIN": "JET_CPF",
76119
"ARGS": {
77120
"signal": "HRTX/PE0"
78121
},
79122
"COMMENT": "No equivalent in the IDS"
80123
},
81-
"heating_current_drive/power_nbi": {
124+
"_local/magnetic_axis/p_e/source": {
125+
"MAP_TYPE": "VALUE",
126+
"VALUE": "CPF:HRTX/PE0"
127+
},
128+
"heating_current_drive/power_nbi/value": {
82129
"MAP_TYPE": "PLUGIN",
83-
"PLUGIN": "JETCPF_Reader",
130+
"PLUGIN": "JET_CPF",
84131
"ARGS": {
85132
"signal": "NBI/NBLM"
86133
}
87134
},
88-
"heating_current_drive/power_ic": {
135+
"heating_current_drive/power_nbi/source": {
136+
"MAP_TYPE": "VALUE",
137+
"VALUE": "CPF:NBI/NBLM"
138+
},
139+
"_heating_current_drive/power_ic/value": {
89140
"MAP_TYPE": "PLUGIN",
90-
"PLUGIN": "JETCPF_Reader",
141+
"PLUGIN": "JET_CPF",
91142
"ARGS": {
92143
"signal": "ICRH/PTOT"
93144
}
145+
},
146+
"heating_current_drive/power_ic/source": {
147+
"MAP_TYPE": "VALUE",
148+
"VALUE": "CPF:ICRH/PTOT"
94149
}
95150
}

0 commit comments

Comments
 (0)