Skip to content

Commit

Permalink
Change mapping files to use [#] index convention rather than /#/ for …
Browse files Browse the repository at this point in the history 
…imas_plugin
  • Loading branch information
@adam-parker1
adam-parker1 committed Aug 30, 2023
1 parent b5e00f5 commit 024e877
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 85 deletions.
14 changes: 7 additions & 7 deletions mappings/mse/mappings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@
},
"channel/Shape_of": {
"MAP_TYPE": "DIMENSION",
"DIM_PROBE": "channel/#/active_spatial_resolution/#/centre/r"
"DIM_PROBE": "channel[#]/active_spatial_resolution[#]/centre/r"
},
"channel/#/active_spatial_resolution/Shape_of": {
"channel[#]/active_spatial_resolution/Shape_of": {
"MAP_TYPE": "VALUE",
"VALUE": 1
},
"channel/#/active_spatial_resolution/#/centre/r": {
"channel[#]/active_spatial_resolution[#]/centre/r": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "UDA",
"ARGS": {
"signal": "AMS/GEOMETRY/RADIUS"
}
},
"channel/#/active_spatial_resolution/#/centre/z": {
"channel[#]/active_spatial_resolution[#]/centre/z": {
"MAP_TYPE": "VALUE",
"VALUE": 0.0
},
"channel/#/active_spatial_resolution/#/centre/phi": {
"channel[#]/active_spatial_resolution[#]/centre/phi": {
"MAP_TYPE": "VALUE",
"VALUE": 0.0
},
"channel/#/active_spatial_resolution/#/geometric_coefficients": {
"channel[#]/active_spatial_resolution[#]/geometric_coefficients": {
"MAP_TYPE": "CUSTOM",
"NAME": "MASTU",
"FUNCTION": "A_COEFFICIENTS"
},
"channel/#/polarisation_angle": {
"channel[#]/polarisation_angle": {
"MAP_TYPE": "SLICE",
"SIGNAL": "_polarisation_angle",
"SLICE_INDEX": ["{{ indices.0 }}"]
Expand Down
44 changes: 22 additions & 22 deletions mappings/pf_active/mappings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,95 +7,95 @@
"MAP_TYPE": "VALUE",
"VALUE": "{{ length(PF_COILS) }}"
},
"coil/#/name" : {
"coil[#]/name" : {
"MAP_TYPE": "VALUE",
"VALUE": "{{ PF_NAME }}"
},
"coil/#/identifier" : {
"coil[#]/identifier" : {
"MAP_TYPE": "VALUE",
"VALUE": "PF_COIL_{{ indices.0 }}"
},
"coil/#/current" : {
"coil[#]/current" : {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "UDA",
"ARGS": {
"signal": "/AMC/ROGEXT/{{ PF_NAME }}"
},
"SCALE": "{{ UNIT_SF }}"
},
"coil/#/function/type" : {
"coil[#]/function/type" : {
"MAP_TYPE": "VALUE",
"VALUE": "{{ FUNCTION }}"
},
"coil/#/element/Shape_of" : {
"coil[#]/element/Shape_of" : {
"MAP_TYPE": "DIMENSION",
"DIM_PROBE": "coil/#/element/#/geometry/rectangle/z"
"DIM_PROBE": "coil[#]/element[#]/geometry/rectangle/z"
},
"coil/#/element/#/geometry/geometry_type": {
"coil[#]/element[#]/geometry/geometry_type": {
"MAP_TYPE": "VALUE",
"VALUE": 2
},
"coil/#/element/#/geometry/rectangle/width": {
"coil[#]/element[#]/geometry/rectangle/width": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
"signal": "/magnetics/pfcoil/{{ PF_GEOM_NAME }}",
"key": "geom_elements.dR"
}
},
"coil/#/element/#/geometry/rectangle/height": {
"coil[#]/element[#]/geometry/rectangle/height": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
"signal": "/magnetics/pfcoil/{{ PF_GEOM_NAME }}",
"key": "geom_elements.dZ"
}
},
"coil/#/element/#/geometry/rectangle/r": {
"coil[#]/element[#]/geometry/rectangle/r": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
"signal": "/magnetics/pfcoil/{{ PF_GEOM_NAME }}",
"key": "geom_elements.centreR"
}
},
"coil/#/element/#/geometry/rectangle/z": {
"coil[#]/element[#]/geometry/rectangle/z": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
"signal": "/magnetics/pfcoil/{{ PF_GEOM_NAME }}",
"key": "geom_elements.centreZ"
}
},
"coil/#/element/#/area": {
"coil[#]/element[#]/area": {
"MAP_TYPE": "EXPR",
"PARAMETERS": {
"WIDTH": "coil/#/element/#/geometry/rectangle/width",
"HEIGHT": "coil/#/element/#/geometry/rectangle/height"
"WIDTH": "coil[#]/element[#]/geometry/rectangle/width",
"HEIGHT": "coil[#]/element[#]/geometry/rectangle/height"
},
"EXPR": "WIDTH*HEIGHT"
},
"circuit/Shape_of" : {
"MAP_TYPE": "VALUE",
"VALUE": "{{ NUM_SUPPLY }}"
},
"circuit/#/name" : {
"circuit[#]/name" : {
"MAP_TYPE": "VALUE",
"VALUE": "CIRCUIT_{{ PF_PS_NAME }}"
},
"circuit/#/identifier" : {
"circuit[#]/identifier" : {
"MAP_TYPE": "VALUE",
"VALUE": "CIRCUIT_{{ indices.0 }}"
},
"circuit/#/current" : {
"circuit[#]/current" : {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "UDA",
"ARGS": {
"signal": "/XCM/{{ SUPPLY_CURRENT_NAME }}"
},
"SCALE": "{{ UNIT_SF }}"
},
"circuit/#/voltage" : {
"circuit[#]/voltage" : {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "UDA",
"ARGS": {
Expand All @@ -106,23 +106,23 @@
"MAP_TYPE": "VALUE",
"VALUE": "{{ NUM_SUPPLY }}"
},
"supply/#/name" : {
"supply[#]/name" : {
"MAP_TYPE": "VALUE",
"VALUE": "{{ PF_PS_NAME }}"
},
"supply/#/identifier" : {
"supply[#]/identifier" : {
"MAP_TYPE": "VALUE",
"VALUE": "SUPPLY_{{ indices.0 }}"
},
"supply/#/current" : {
"supply[#]/current" : {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "UDA",
"ARGS": {
"signal": "/XCM/{{ SUPPLY_CURRENT_NAME }}"
},
"SCALE": "{{ UNIT_SF }}"
},
"supply/#/voltage" : {
"supply[#]/voltage" : {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "UDA",
"ARGS": {
Expand Down
34 changes: 17 additions & 17 deletions mappings/pf_passive/mappings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,71 +7,71 @@
"MAP_TYPE": "VALUE",
"VALUE": "{{ length(LOOPS) }}"
},
"loop/#/resistance": {
"loop[#]/resistance": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
"signal": "/passive/efit/{{ PASSIVE_NAME }}",
"key": "resistance"
}
},
"loop/#/resistivity": {
"loop[#]/resistivity": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
"signal": "/passive/efit/{{ PASSIVE_NAME }}",
"key": "resistivity"
}
},
"loop/#/current": {
"loop[#]/current": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "UDA",
"ARGS": {
"signal": "{{ PASSIVE_CURRENT }}"
},
"SCALE": "{{ UNIT_SF }}"
},
"loop/#/element/Shape_of": {
"loop[#]/element/Shape_of": {
"MAP_TYPE": "DIMENSION",
"DIM_PROBE": "loop/#/element/#/geometry/oblique/r"
"DIM_PROBE": "loop[#]/element[#]/geometry/oblique/r"
},
"loop/#/element/#/name": {
"loop[#]/element[#]/name": {
"MAP_TYPE": "VALUE",
"VALUE": "{{ PASSIVE_NAME }}_{{ indices.1 }}"
},
"loop/#/element/#/identifier": {
"loop[#]/element[#]/identifier": {
"MAP_TYPE": "VALUE",
"VALUE": "LOOP_ELEM_{{ indices.0 }}"
},
"loop/#/element/#/area": {
"loop[#]/element[#]/area": {
"MAP_TYPE": "EXPR",
"PARAMETERS": {
"dR": "_dR",
"dZ": "_dZ"
},
"EXPR": "dR*dZ"
},
"loop/#/element/#/geometry/geometry_type": {
"loop[#]/element[#]/geometry/geometry_type": {
"MAP_TYPE": "VALUE",
"VALUE": 3
},
"loop/#/element/#/geometry/oblique/r": {
"loop[#]/element[#]/geometry/oblique/r": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
"signal": "/passive/efit/{{ PASSIVE_NAME }}",
"key": "centreR"
}
},
"loop/#/element/#/geometry/oblique/z": {
"loop[#]/element[#]/geometry/oblique/z": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
"signal": "/passive/efit/{{ PASSIVE_NAME }}",
"key": "centreZ"
}
},
"loop/#/element/#/geometry/oblique/alpha": {
"loop[#]/element[#]/geometry/oblique/alpha": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
Expand All @@ -80,7 +80,7 @@
},
"SCALE": "{{ DEG2RAD }}"
},
"loop/#/element/#/geometry/oblique/beta": {
"loop[#]/element[#]/geometry/oblique/beta": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
Expand All @@ -89,19 +89,19 @@
},
"OFFSET": 90
},
"loop/#/element/#/geometry/oblique/length_alpha": {
"loop[#]/element[#]/geometry/oblique/length_alpha": {
"MAP_TYPE": "EXPR",
"PARAMETERS": {
"dR": "_dR",
"a": "loop/#/element/#/geometry/oblique/alpha"
"a": "loop[#]/element[#]/geometry/oblique/alpha"
},
"EXPR": "dR / cos(a)"
},
"loop/#/element/#/geometry/oblique/length_beta": {
"loop[#]/element[#]/geometry/oblique/length_beta": {
"MAP_TYPE": "EXPR",
"PARAMETERS": {
"dZ": "_dZ",
"b": "loop/#/element/#/geometry/oblique/beta"
"b": "loop[#]/element[#]/geometry/oblique/beta"
},
"EXPR": "dZ / cos(b)"
},
Expand Down
32 changes: 0 additions & 32 deletions mappings/pulse_schedule/mappings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,5 @@
"ids_properties/homogeneous_time": {
"MAP_TYPE": "VALUE",
"VALUE": 0
},

"channel/Shape_of": {
"MAP_TYPE": "DIMENSION",
"DIM_PROBE": "channel/#/active_spatial_resolution/#/centre/r"
},
"channel/#/active_spatial_resolution/Shape_of": {
"MAP_TYPE": "VALUE",
"VALUE": 1
},
"channel/#/active_spatial_resolution/#/centre/r": {
"MAP_TYPE": "MAP",
"KEY": "AMS/GEOMETRY/RADIUS",
"PLUGIN": "UDA"
},
"channel/#/active_spatial_resolution/#/centre/z": {
"MAP_TYPE": "VALUE",
"VALUE": 0.0
},
"channel/#/active_spatial_resolution/#/centre/phi": {
"MAP_TYPE": "VALUE",
"VALUE": 0.0
},
"channel/#/active_spatial_resolution/#/geometric_coefficients": {
"MAP_TYPE": "VALUE",
"VALUE": [1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9]
},
"channel/#/polarisation_angle": {
"MAP_TYPE": "SLICE",
"KEY": "AMS/GAMMA/POLARISATION_ANGLE",
"PLUGIN": "UDA",
"SLICE_INDEX": "1;2"
}
}
14 changes: 7 additions & 7 deletions mappings/wall/mappings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@
"MAP_TYPE": "VALUE",
"VALUE": 1
},
"description_2d/#/type/name": {
"description_2d[#]/type/name": {
"MAP_TYPE": "VALUE",
"VALUE": "Equilibrium codes"
},
"description_2d/#/type/index": {
"description_2d[#]/type/index": {
"MAP_TYPE": "VALUE",
"VALUE": 0
},
"description_2d/#/type/description": {
"description_2d[#]/type/description": {
"MAP_TYPE": "VALUE",
"VALUE": "A limiting surface for EFIT++"
},
"description_2d/#/limiter/unit/Shape_of": {
"description_2d[#]/limiter/unit/Shape_of": {
"MAP_TYPE": "VALUE",
"VALUE": 1
},
"description_2d/#/limiter/unit/#/closed": {
"description_2d[#]/limiter/unit[#]/closed": {
"MAP_TYPE": "VALUE",
"VALUE": 1
},
"description_2d/#/limiter/unit/#/outline/r": {
"description_2d[#]/limiter/unit[#]/outline/r": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
"signal": "/limiter/efit",
"key": "R"
}
},
"description_2d/#/limiter/unit/#/outline/z": {
"description_2d[#]/limiter/unit[#]/outline/z": {
"MAP_TYPE": "PLUGIN",
"PLUGIN": "GEOM",
"ARGS": {
Expand Down

0 comments on commit 024e877

Please sign in to comment.