CDPP / AMDA_IHM

Commit 01f7f229260c8dbd883a56bf39496858e84cbc98

Authored by Benjamin Renard
1 parent 251a648a
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Update EISCAT templated parameters definition

Showing 9 changed files with 280 additions and 8 deletions   Show diff stats
Inline Side-by-side
generic_data/ParamTemplate/ParamTemplateList.xml
  Diff comments   View file @01f7f22
... ... @@ -24,7 +24,7 @@
24 24 <paramTemplate paramId='eiscat_esr42m_ne' fileName='eiscat_esr42m_ne_##mode##_##corrected##_##yaxis##'>
25 25 <arguments>
26 26 <argument key='mode' name='Mode' type='list' default='field-aligned'>
27   - <item key='field-aligned' name='Field aligned'/>
  27 + <item key='field-aligned' name='Fixed pos. : Field aligned'/>
28 28 </argument>
29 29 <argument key='corrected' name='Corrected' type='bool' default='0'/>
30 30 <argument key='yaxis' name='Y Axis' type='list' default='range'>
... ... @@ -38,7 +38,7 @@
38 38 <paramTemplate paramId='eiscat_esr42m_te' fileName='eiscat_esr42m_te_##mode##_##corrected##_##yaxis##'>
39 39 <arguments>
40 40 <argument key='mode' name='Mode' type='list' default='field-aligned'>
41   - <item key='field-aligned' name='Field aligned'/>
  41 + <item key='field-aligned' name='Fixed pos. : Field aligned'/>
42 42 </argument>
43 43 <argument key='corrected' name='Corrected' type='bool' default='0'/>
44 44 <argument key='yaxis' name='Y Axis' type='list' default='range'>
... ... @@ -52,7 +52,7 @@
52 52 <paramTemplate paramId='eiscat_esr42m_ti' fileName='eiscat_esr42m_ti_##mode##_##corrected##_##yaxis##'>
53 53 <arguments>
54 54 <argument key='mode' name='Mode' type='list' default='field-aligned'>
55   - <item key='field-aligned' name='Field aligned'/>
  55 + <item key='field-aligned' name='Fixed pos. : Field aligned'/>
56 56 </argument>
57 57 <argument key='corrected' name='Corrected' type='bool' default='0'/>
58 58 <argument key='yaxis' name='Y Axis' type='list' default='range'>
... ... @@ -66,7 +66,75 @@
66 66 <paramTemplate paramId='eiscat_esr42m_vi' fileName='eiscat_esr42m_vi_##mode##_##corrected##_##yaxis##'>
67 67 <arguments>
68 68 <argument key='mode' name='Mode' type='list' default='field-aligned'>
69   - <item key='field-aligned' name='Field aligned'/>
  69 + <item key='field-aligned' name='Fixed pos. : Field aligned'/>
  70 + </argument>
  71 + <argument key='corrected' name='Corrected' type='bool' default='0'/>
  72 + <argument key='yaxis' name='Y Axis' type='list' default='range'>
  73 + <item key='range' name='Range'/>
  74 + <item key='alt' name='Altitude'/>
  75 + <item key='geolat' name='Geographic latitude'/>
  76 + <item key='geolong' name='Geographic longitude'/>
  77 + </argument>
  78 + </arguments>
  79 + </paramTemplate>
  80 + <paramTemplate paramId='eiscat_esr32m_ne' fileName='eiscat_esr32m_ne_##mode##_##corrected##_##yaxis##'>
  81 + <arguments>
  82 + <argument key='mode' name='Mode' type='list' default='all'>
  83 + <item key='all' name='All'/>
  84 + <item key='field-aligned' name='Fixed pos. : Field aligned'/>
  85 + <item key='other' name='Fixed pos. : Other'/>
  86 + <item key='multipos-scan' name='Multi pos. and scan'/>
  87 + </argument>
  88 + <argument key='corrected' name='Corrected' type='bool' default='0'/>
  89 + <argument key='yaxis' name='Y Axis' type='list' default='range'>
  90 + <item key='range' name='Range'/>
  91 + <item key='alt' name='Altitude'/>
  92 + <item key='geolat' name='Geographic latitude'/>
  93 + <item key='geolong' name='Geographic longitude'/>
  94 + </argument>
  95 + </arguments>
  96 + </paramTemplate>
  97 + <paramTemplate paramId='eiscat_esr32m_te' fileName='eiscat_esr32m_te_##mode##_##corrected##_##yaxis##'>
  98 + <arguments>
  99 + <argument key='mode' name='Mode' type='list' default='all'>
  100 + <item key='all' name='All'/>
  101 + <item key='field-aligned' name='Fixed pos. : Field aligned'/>
  102 + <item key='other' name='Fixed pos. : Other'/>
  103 + <item key='multipos-scan' name='Multi pos. and scan'/>
  104 + </argument>
  105 + <argument key='corrected' name='Corrected' type='bool' default='0'/>
  106 + <argument key='yaxis' name='Y Axis' type='list' default='range'>
  107 + <item key='range' name='Range'/>
  108 + <item key='alt' name='Altitude'/>
  109 + <item key='geolat' name='Geographic latitude'/>
  110 + <item key='geolong' name='Geographic longitude'/>
  111 + </argument>
  112 + </arguments>
  113 + </paramTemplate>
  114 + <paramTemplate paramId='eiscat_esr32m_ti' fileName='eiscat_esr32m_ti_##mode##_##corrected##_##yaxis##'>
  115 + <arguments>
  116 + <argument key='mode' name='Mode' type='list' default='all'>
  117 + <item key='all' name='All'/>
  118 + <item key='field-aligned' name='Fixed pos. : Field aligned'/>
  119 + <item key='other' name='Fixed pos. : Other'/>
  120 + <item key='multipos-scan' name='Multi pos. and scan'/>
  121 + </argument>
  122 + <argument key='corrected' name='Corrected' type='bool' default='0'/>
  123 + <argument key='yaxis' name='Y Axis' type='list' default='range'>
  124 + <item key='range' name='Range'/>
  125 + <item key='alt' name='Altitude'/>
  126 + <item key='geolat' name='Geographic latitude'/>
  127 + <item key='geolong' name='Geographic longitude'/>
  128 + </argument>
  129 + </arguments>
  130 + </paramTemplate>
  131 + <paramTemplate paramId='eiscat_esr32m_vi' fileName='eiscat_esr32m_vi_##mode##_##corrected##_##yaxis##'>
  132 + <arguments>
  133 + <argument key='mode' name='Mode' type='list' default='all'>
  134 + <item key='all' name='All'/>
  135 + <item key='field-aligned' name='Fixed pos. : Field aligned'/>
  136 + <item key='other' name='Fixed pos. : Other'/>
  137 + <item key='multipos-scan' name='Multi pos. and scan'/>
70 138 </argument>
71 139 <argument key='corrected' name='Corrected' type='bool' default='0'/>
72 140 <argument key='yaxis' name='Y Axis' type='list' default='range'>
... ...
generic_data/ParamTemplate/eiscat_esr32m_ne_##mode##_##corrected##_##yaxis##.xml 0 → 100644
  Diff comments   View file @01f7f22
... ... @@ -0,0 +1,44 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<param xml:id="eiscat_esr32m_ne_##mode##_##corrected##_##yaxis##">
  3 + <info>
  4 + <name>Electron density</name>
  5 + <short_name>Ne</short_name>
  6 + <components/>
  7 + <units>m-3</units>
  8 + <coordinates_system/>
  9 + <tensor_order/>
  10 + <si_conversion/>
  11 + <table>
  12 + <centerAutoTable variable="true" centerName="eiscat_esr32m_##yaxis##" log="false"/>
  13 + </table>
  14 + <fill_value/>
  15 + <ucd/>
  16 + <dataset_id/>
  17 + </info>
  18 + <gap_threshold>10</gap_threshold>
  19 + <get>
  20 + <vi name="eiscat:32m:all">
  21 + <baseParam name="Ne" useNearestValue="true"/>
  22 + </vi>
  23 + <amdaParam name='eiscat_esr32m_##yaxis##'/>
  24 + </get>
  25 + <process/>
  26 + <output>
  27 + <plot>
  28 + <timePlot>
  29 + <params>
  30 + <param id="eiscat_esr32m_ne_##mode##_##corrected##_##yaxis##">
  31 + <spectro yAxis="y-left"/>
  32 + </param>
  33 + </params>
  34 + <axes>
  35 + <zAxis>
  36 + <colorAxis scale="logarithmic">
  37 + <range min="10000000000" max="1000000000000"/>
  38 + </colorAxis>
  39 + </zAxis>
  40 + </axes>
  41 + </timePlot>
  42 + </plot>
  43 + </output>
  44 +</param>
... ...
generic_data/ParamTemplate/eiscat_esr32m_te_##mode##_##corrected##_##yaxis##.xml 0 → 100644
  Diff comments   View file @01f7f22
... ... @@ -0,0 +1,44 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<param xml:id="eiscat_esr32m_te_##mode##_##corrected##_##yaxis##">
  3 + <info>
  4 + <name>Electron temperature</name>
  5 + <short_name>Te</short_name>
  6 + <components/>
  7 + <units>K</units>
  8 + <coordinates_system/>
  9 + <tensor_order/>
  10 + <si_conversion/>
  11 + <table>
  12 + <centerAutoTable variable="true" centerName="eiscat_esr32m_##yaxis##" log="false"/>
  13 + </table>
  14 + <fill_value/>
  15 + <ucd/>
  16 + <dataset_id/>
  17 + </info>
  18 + <gap_threshold>10</gap_threshold>
  19 + <get>
  20 + <vi name="eiscat:32m:all">
  21 + <baseParam name="Te" useNearestValue="true"/>
  22 + </vi>
  23 + <amdaParam name='eiscat_esr32m_##yaxis##'/>
  24 + </get>
  25 + <process/>
  26 + <output>
  27 + <plot>
  28 + <timePlot>
  29 + <params>
  30 + <param id="eiscat_esr32m_te_##mode##_##corrected##_##yaxis##">
  31 + <spectro yAxis="y-left"/>
  32 + </param>
  33 + </params>
  34 + <axes>
  35 + <zAxis>
  36 + <colorAxis>
  37 + <range min="500" max="4000"/>
  38 + </colorAxis>
  39 + </zAxis>
  40 + </axes>
  41 + </timePlot>
  42 + </plot>
  43 + </output>
  44 +</param>
... ...
generic_data/ParamTemplate/eiscat_esr32m_ti_##mode##_##corrected##_##yaxis##.xml 0 → 100644
  Diff comments   View file @01f7f22
... ... @@ -0,0 +1,44 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<param xml:id="eiscat_esr32m_ti_##mode##_##corrected##_##yaxis##">
  3 + <info>
  4 + <name>Ion temperature</name>
  5 + <short_name>Ti</short_name>
  6 + <components/>
  7 + <units>K</units>
  8 + <coordinates_system/>
  9 + <tensor_order/>
  10 + <si_conversion/>
  11 + <table>
  12 + <centerAutoTable variable="true" centerName="eiscat_esr32m_##yaxis##" log="false"/>
  13 + </table>
  14 + <fill_value/>
  15 + <ucd/>
  16 + <dataset_id/>
  17 + </info>
  18 + <gap_threshold>10</gap_threshold>
  19 + <get>
  20 + <vi name="eiscat:32m:all">
  21 + <baseParam name="Ti" useNearestValue="true"/>
  22 + </vi>
  23 + <amdaParam name='eiscat_esr32m_##yaxis##'/>
  24 + </get>
  25 + <process/>
  26 + <output>
  27 + <plot>
  28 + <timePlot>
  29 + <params>
  30 + <param id="eiscat_esr32m_ti_##mode##_##corrected##_##yaxis##">
  31 + <spectro yAxis="y-left"/>
  32 + </param>
  33 + </params>
  34 + <axes>
  35 + <zAxis>
  36 + <colorAxis>
  37 + <range min="500" max="3000"/>
  38 + </colorAxis>
  39 + </zAxis>
  40 + </axes>
  41 + </timePlot>
  42 + </plot>
  43 + </output>
  44 +</param>
... ...
generic_data/ParamTemplate/eiscat_esr32m_vi_##mode##_##corrected##_##yaxis##.xml 0 → 100644
  Diff comments   View file @01f7f22
... ... @@ -0,0 +1,44 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<param xml:id="eiscat_esr32m_vi_##mode##_##corrected##_##yaxis##">
  3 + <info>
  4 + <name>Ion velocity</name>
  5 + <short_name>Vi</short_name>
  6 + <components/>
  7 + <units>m.s-1</units>
  8 + <coordinates_system/>
  9 + <tensor_order/>
  10 + <si_conversion/>
  11 + <table>
  12 + <centerAutoTable variable="true" centerName="eiscat_esr32m_##yaxis##" log="false"/>
  13 + </table>
  14 + <fill_value/>
  15 + <ucd/>
  16 + <dataset_id/>
  17 + </info>
  18 + <gap_threshold>10</gap_threshold>
  19 + <get>
  20 + <vi name="eiscat:32m:all">
  21 + <baseParam name="Vi" useNearestValue="true"/>
  22 + </vi>
  23 + <amdaParam name='eiscat_esr32m_##yaxis##'/>
  24 + </get>
  25 + <process/>
  26 + <output>
  27 + <plot>
  28 + <timePlot>
  29 + <params>
  30 + <param id="eiscat_esr32m_vi_##mode##_##corrected##_##yaxis##">
  31 + <spectro yAxis="y-left"/>
  32 + </param>
  33 + </params>
  34 + <axes>
  35 + <zAxis>
  36 + <colorAxis>
  37 + <range min="-500" max="500"/>
  38 + </colorAxis>
  39 + </zAxis>
  40 + </axes>
  41 + </timePlot>
  42 + </plot>
  43 + </output>
  44 +</param>
... ...
generic_data/ParamTemplate/eiscat_esr42m_ne_##mode##_##corrected##_##yaxis##.xml
  Diff comments   View file @01f7f22
... ... @@ -17,7 +17,7 @@
17 17 </info>
18 18 <get>
19 19 <vi name="eiscat:42m:fa">
20   - <baseParam name="Ne"/>
  20 + <baseParam name="Ne" useNearestValue="true"/>
21 21 </vi>
22 22 <amdaParam name='eiscat_esr42m_##yaxis##'/>
23 23 </get>
... ... @@ -30,6 +30,13 @@
30 30 <spectro yAxis="y-left"/>
31 31 </param>
32 32 </params>
  33 + <axes>
  34 + <zAxis>
  35 + <colorAxis scale="logarithmic">
  36 + <range min="10000000000" max="1000000000000"/>
  37 + </colorAxis>
  38 + </zAxis>
  39 + </axes>
33 40 </timePlot>
34 41 </plot>
35 42 </output>
... ...
generic_data/ParamTemplate/eiscat_esr42m_te_##mode##_##corrected##_##yaxis##.xml
  Diff comments   View file @01f7f22
... ... @@ -17,7 +17,7 @@
17 17 </info>
18 18 <get>
19 19 <vi name="eiscat:42m:fa">
20   - <baseParam name="Te"/>
  20 + <baseParam name="Te" useNearestValue="true"/>
21 21 </vi>
22 22 <amdaParam name='eiscat_esr42m_##yaxis##'/>
23 23 </get>
... ... @@ -30,6 +30,13 @@
30 30 <spectro yAxis="y-left"/>
31 31 </param>
32 32 </params>
  33 + <axes>
  34 + <zAxis>
  35 + <colorAxis>
  36 + <range min="500" max="4000"/>
  37 + </colorAxis>
  38 + </zAxis>
  39 + </axes>
33 40 </timePlot>
34 41 </plot>
35 42 </output>
... ...
generic_data/ParamTemplate/eiscat_esr42m_ti_##mode##_##corrected##_##yaxis##.xml
  Diff comments   View file @01f7f22
... ... @@ -17,7 +17,7 @@
17 17 </info>
18 18 <get>
19 19 <vi name="eiscat:42m:fa">
20   - <baseParam name="Ti"/>
  20 + <baseParam name="Ti" useNearestValue="true"/>
21 21 </vi>
22 22 <amdaParam name='eiscat_esr42m_##yaxis##'/>
23 23 </get>
... ... @@ -30,6 +30,13 @@
30 30 <spectro yAxis="y-left"/>
31 31 </param>
32 32 </params>
  33 + <axes>
  34 + <zAxis>
  35 + <colorAxis>
  36 + <range min="500" max="3000"/>
  37 + </colorAxis>
  38 + </zAxis>
  39 + </axes>
33 40 </timePlot>
34 41 </plot>
35 42 </output>
... ...
generic_data/ParamTemplate/eiscat_esr42m_vi_##mode##_##corrected##_##yaxis##.xml
  Diff comments   View file @01f7f22
... ... @@ -17,7 +17,7 @@
17 17 </info>
18 18 <get>
19 19 <vi name="eiscat:42m:fa">
20   - <baseParam name="Vi"/>
  20 + <baseParam name="Vi" useNearestValue="true"/>
21 21 </vi>
22 22 <amdaParam name='eiscat_esr42m_##yaxis##'/>
23 23 </get>
... ... @@ -30,6 +30,13 @@
30 30 <spectro yAxis="y-left"/>
31 31 </param>
32 32 </params>
  33 + <axes>
  34 + <zAxis>
  35 + <colorAxis>
  36 + <range min="-500" max="500"/>
  37 + </colorAxis>
  38 + </zAxis>
  39 + </axes>
33 40 </timePlot>
34 41 </plot>
35 42 </output>
... ...