CDPP / AMDA_IHM

Commit 46e96f77d961584435c3cfbc643eacab33cbdd03

Authored by Benjamin Renard
2 parents ded8189b 4746dc6e
Exists in master and in 65 other branches 10098, 10178, 5390, 7616, 9014, 9016Bis, 9084, 9326, 9505, 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, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, test-merge

Merge branch 'master' into amdadev

Showing 7 changed files with 33 additions and 82 deletions   Show diff stats
Inline Side-by-side
generic_data/Functions/functions.xml
  Diff comments   View file @46e96f7
... ... @@ -49,34 +49,6 @@
49 49 <info_brief>skewness() function</info_brief>
50 50 <new_kernel>#skew</new_kernel>
51 51 </function>
52   - <function name="covariance_(,,)" args="2" kind="time" group="stat">
53   - <prompts>
54   - <prompt>input window time in secs</prompt>
55   - </prompts>
56   - <info_brief>covariance() function for two params</info_brief>
57   - <new_kernel>#covariance</new_kernel>
58   - </function>
59   - <function name="pearson_(,,)" args="2" kind="time" group="stat">
60   - <prompts>
61   - <prompt>input window time in secs</prompt>
62   - </prompts>
63   - <info_brief>Pearson coefficient of two parameters</info_brief>
64   - <new_kernel>#pearson</new_kernel>
65   - </function>
66   - <function name="kendall_(,,)" args="2" kind="time" group="stat">
67   - <prompts>
68   - <prompt>input window time in secs</prompt>
69   - </prompts>
70   - <info_brief>Kendall coefficient of two parameters</info_brief>
71   - <new_kernel>#kendall</new_kernel>
72   - </function>
73   - <function name="spearman_(,,)" args="2" kind="time" group="stat">
74   - <prompts>
75   - <prompt>input window time in secs</prompt>
76   - </prompts>
77   - <info_brief>Spearman coefficient of two parameters</info_brief>
78   - <new_kernel>#spearman</new_kernel>
79   - </function>
80 52 <function name="mean_sm_(,)" args="1" kind="sliding" group="stat">
81 53 <prompts>
82 54 <prompt>input averaging time in secs</prompt>
... ... @@ -142,37 +114,11 @@
142 114 <info_brief>Remove Spikes ( ! Experimental ! ) : filter(param, factor,nPoints)</info_brief>
143 115 <new_kernel>#filter</new_kernel>
144 116 </function>
145   - <function name="BCain(,)" args="2" kind="model" group="space">
146   - <default_args>"",mag</default_args>
147   - <info_brief>Cain model for Mars Magnetic Field</info_brief>
148   - <new_kernel>#bcain</new_kernel>
149   - </function>
150 117 <function name="vAlfven(,)" args="2" kind="physics" group="space">
151 118 <prompt_param>density[cm^⁻3], b_magnitude[nT]</prompt_param>
152 119 <info_brief>Alfven velocity Valfven(density[cm^⁻3], b_magnitude[nT])</info_brief>
153 120 <new_kernel>alfvenVelocity</new_kernel>
154 121 </function>
155   - <function name="mlt_maglib(,)" args="1" kind="physics" group="space">
156   - <prompts>
157   - <prompt type="list" subtype="external_fields" default="1">External field:</prompt>
158   - </prompts>
159   - <info_brief>Compute MLT from geographical spacecraft position (cartesian coordinates and in Earth radius)</info_brief>
160   - <new_kernel>#maglib_mlt</new_kernel>
161   - </function>
162   - <function name="invlat_maglib(,)" args="1" kind="physics" group="space">
163   - <prompts>
164   - <prompt type="list" subtype="external_fields" default="1">External field:</prompt>
165   - </prompts>
166   - <info_brief>Compute InvLat from geographical spacecraft position (cartesian coordinates and in Earth radius)</info_brief>
167   - <new_kernel>#maglib_invlat</new_kernel>
168   - </function>
169   - <function name="lparam_maglib(,)" args="1" kind="physics" group="space">
170   - <prompts>
171   - <prompt type="list" subtype="external_fields" default="1">External field:</prompt>
172   - </prompts>
173   - <info_brief>Compute L Param from geographical spacecraft position (cartesian coordinates and in Earth radius)</info_brief>
174   - <new_kernel>#maglib_lparam</new_kernel>
175   - </function>
176 122  
177 123 <function name="perreault78(,,)" args="3" kind="model" group="space">
178 124 <info_brief>Perreault and Akasofu 1978 model u = perreault78(E_mag, B_mag, theta_p)</info_brief>
... ... @@ -210,30 +156,6 @@
210 156 </info_brief>
211 157 <new_kernel>lopez90</new_kernel>
212 158 </function>
213   - <function name="pv_ionos_dn(,)" args="2" kind="model" group="space">
214   - <prompt_param></prompt_param>
215   - <default_args>alt(Km), sza(Radians)</default_args>
216   - <info_brief>
217   - Electron Density around Venus &lt;br/&gt;
218   - dn = pv_ionos_dn(alt, sza) &lt;br/&gt;
219   - alt is the altitude in Km
220   - sza is the solat zenith angle in radians
221   - dn is the base 10 log of the model electron density in no/cc
222   - </info_brief>
223   - <new_kernel>pv_ionos_dn</new_kernel>
224   - </function>
225   - <function name="pv_ionos_te(,)" args="2" kind="model" group="space">
226   - <prompt_param></prompt_param>
227   - <default_args>alt(Km), sza(Radians)</default_args>
228   - <info_brief>
229   - Electron temperature around Venus &lt;br/&gt;
230   - te = pv_ionos_dn(alt, sza) &lt;br/&gt;
231   - alt is the altitude in Km
232   - sza is the solat zenith angle in radians
233   - te is in log10 deg K
234   - </info_brief>
235   - <new_kernel>pv_ionos_te</new_kernel>
236   - </function>
237 159 <function name="framesTransformation(,,,)" args="1" kind="frames" group="space">
238 160 <prompts>
239 161 <prompt type="list" subtype="frames" default="GSM">Input frame:</prompt>
... ...
help/info.html
  Diff comments   View file @46e96f7
... ... @@ -33,7 +33,7 @@
33 33 <ul>
34 34 <li><h4>Python package</h4>
35 35 <ul>
36   - <li><a href="amdapy" target="_blank">amdapy</a>
  36 + <li><a href="https://speasy.readthedocs.io/en/latest/amda.html" target="_blank">speasy</a>
37 37 </ul>
38 38 </ul>
39 39 </div>
... ...
index.html
  Diff comments   View file @46e96f7
... ... @@ -110,7 +110,7 @@
110 110 <div id="DateAnnoucement">28/07/2021</div>
111 111 <div id="TexteAnnoucement">Fix remote access to CDAWeb</div>
112 112 <div id="DateAnnoucement">19/04/2021</div>
113   -<div id="TexteAnnoucement">New tool:<a target='_blank' href="http://amda.irap.omp.eu/help/amdapy/index.html"> Python package for AMDA</a></div>
  113 +<div id="TexteAnnoucement">New tool:<a target='_blank' href="https://speasy.readthedocs.io/en/latest/amda.html"> Python package for AMDA</a></div>
114 114 <div id="DateAnnoucement">19/04/2021</div>
115 115 <div id="TexteAnnoucement">New data:</br>ACE/SWEPAM Electron Pitch Angle</div>
116 116 <div id="DateAnnoucement">22/02/2021</div>
... ...
php/WebServices/WebServer.php
  Diff comments   View file @46e96f7
... ... @@ -305,6 +305,11 @@ class WebServer
305 305 $restricted = $xp->query("//*[@group]");
306 306  
307 307 foreach ($restricted as $node) {
  308 + $timeRestriction = $node->getAttribute('timeRestriction');
  309 + if (!empty($timeRestriction)) {
  310 + continue;
  311 + }
  312 +
308 313 $parentNode = $node->parentNode;
309 314 $parentNode->removeChild($node);
310 315  
... ...
php/WebServices/xml/AmdaPlots.xml
  Diff comments   View file @46e96f7
... ... @@ -21,6 +21,10 @@
21 21 <param name='vpbulk_sta'/>
22 22 <param name='vth_sta'/>
23 23 </mission>
  24 + <mission xml:id='STEREO-A-EP'>
  25 + <param name='sta_het_1min_efl(0)'/>
  26 + <param name='sta_het_1min_hfl(3)'/>
  27 + </mission>
24 28 <mission xml:id='STEREO-B'>
25 29 <param name='stb_btot'/>
26 30 <param name='stb_b'/>
... ... @@ -28,6 +32,10 @@
28 32 <param name='vpbulk_stb'/>
29 33 <param name='vth_stb'/>
30 34 </mission>
  35 + <mission xml:id='STEREO-B-EP'>
  36 + <param name='stb_het_1min_efl(0)'/>
  37 + <param name='stb_het_1min_hfl(3)'/>
  38 + </mission>
31 39 <mission xml:id='VEX'>
32 40 <param name='vex_mag_4s_tot'/>
33 41 <param name='vex_mag_4s'/>
... ... @@ -64,4 +72,12 @@
64 72 <param name='dsc_tpr'/>
65 73 <param name='dsc_vpr'/>
66 74 </mission>
  75 + <mission xml:id='PSP'>
  76 + <param name='psp_het_1min_AHf(6)'/>
  77 + <param name='psp_het_1min_BHf(6)'/>
  78 + </mission>
  79 + <mission xml:id='SOLO'>
  80 + <param name='solo_het_tot_eflux(0)'/>
  81 + <param name='solo_het_total_hflux(16)'/>
  82 + </mission>
67 83 </missions>
... ...
php/classes/AmdaAction.php
  Diff comments   View file @46e96f7
... ... @@ -184,7 +184,10 @@ class AmdaAction
184 184  
185 185 case 'timeTable':
186 186 case 'catalog':
187   - if ($isLeaf) $info = $child->getAttribute('intervals').' intervals';
  187 + if ($isLeaf) {
  188 + $info = '<b>Nb intervals:</b> '.$child->getAttribute('intervals').'<br/>';
  189 + $info .= '<b>ID:</b> '. $child->getAttribute('xml:id');
  190 + }
188 191 break;
189 192  
190 193 case 'sharedtimeTable':
... ... @@ -193,7 +196,8 @@ class AmdaAction
193 196 {
194 197 $info = '<b>Nb intervals:</b> '.$child->getAttribute('nbIntervals').'<br/>';
195 198 $info .= '<b>Shared by:</b> '.$child->getAttribute('sharedBy').' ('.$child->getAttribute('sharedDate').')<br/>';
196   - $info .= '<b>Description:</b> '.$child->getAttribute('description');
  199 + $info .= '<b>Description:</b> '.$child->getAttribute('description').'<br/>';
  200 + $info .= '<b>ID:</b> ' . $child->getAttribute('xml:id');
197 201 }
198 202 break;
199 203 case 'derivedParam':
... ...
public/wsdl/Methods_AMDA.wsdl
  Diff comments   View file @46e96f7
... ... @@ -167,7 +167,9 @@
167 167 <xs:restriction base="xs:string">
168 168 <xs:enumeration value="ACE"/>
169 169 <xs:enumeration value="STEREO-A"/>
  170 + <xs:enumeration value="STEREO-A-EP"/>
170 171 <xs:enumeration value="STEREO-B"/>
  172 + <xs:enumeration value="STEREO-B-EP"/>
171 173 <xs:enumeration value="WIND"/>
172 174 <xs:enumeration value="VEX"/>
173 175 <xs:enumeration value="OMNI"/>
... ... @@ -175,6 +177,8 @@
175 177 <xs:enumeration value="MEX"/>
176 178 <xs:enumeration value="DSCOVR"/>
177 179 <xs:enumeration value="MAVEN"/>
  180 + <xs:enumeration value="PSP"/>
  181 + <xs:enumeration value="SOLO"/>
178 182 </xs:restriction>
179 183 </xs:simpleType>
180 184  
... ...