CDPP / AMDA_IHM

Commit cec289da8493bf7056f15c14ead283dfed43d90b

Authored by Hacene SI HADJ MOHAND
1 parent f17b2e35
Exists in master and in 83 other branches 10098, 10178, 5390, 6629, 7494, 7616, 8459, 8528, 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, akkodis/amdadev, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, rm_6912, rm_6912_bis, rm_8932, special-params, test-merge, ws_get_catalog

attribut rajoute attention defaut true

Showing 3 changed files with 25 additions and 14 deletions   Show diff stats
Inline Side-by-side
generic_data/Functions/functions.xml
  Diff comments   View file @cec289d
@@ -109,7 +109,10 @@ @@ -109,7 +109,10 @@
109 <info_brief>Shifts parameter by T secs back (T &lt; 0) and forth (T &gt; 0))</info_brief> 109 <info_brief>Shifts parameter by T secs back (T &lt; 0) and forth (T &gt; 0))</info_brief>
110 <new_kernel>#timeShift</new_kernel> 110 <new_kernel>#timeShift</new_kernel>
111 </function> 111 </function>
112 - 112 + <function name="filter()" kind="amda" group="space">
  113 + <info_brief>Remove Spikes</info_brief>
  114 + <new_kernel>#filter</new_kernel>
  115 + </function>
113 <function name="vAlfven(,)" args="2" kind="physics" group="space"> 116 <function name="vAlfven(,)" args="2" kind="physics" group="space">
114 <prompt_param>density[cm^⁻3], b_magnitude[nT]</prompt_param> 117 <prompt_param>density[cm^⁻3], b_magnitude[nT]</prompt_param>
115 <info_brief>Alfven velocity Valfven(density[cm^⁻3], b_magnitude[nT])</info_brief> 118 <info_brief>Alfven velocity Valfven(density[cm^⁻3], b_magnitude[nT])</info_brief>
@@ -274,4 +277,5 @@ @@ -274,4 +277,5 @@
274 <info_brief>Square root</info_brief> 277 <info_brief>Square root</info_brief>
275 <new_kernel>sqrt</new_kernel> 278 <new_kernel>sqrt</new_kernel>
276 </function> 279 </function>
  280 +
277 </functions> 281 </functions>
js/app/models/PlotObjects/PlotParamObject.js
  Diff comments   View file @cec289d
@@ -71,8 +71,8 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, { @@ -71,8 +71,8 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
71 { 71 {
72 case 'serie' : 72 case 'serie' :
73 return new amdaPlotObj.PlotSerieObject(data); 73 return new amdaPlotObj.PlotSerieObject(data);
74 - case 'orbit-serie' :  
75 - return new amdaPlotObj.PlotOrbitSerieObject(data); 74 + case 'orbit-serie' :
  75 + return new amdaPlotObj.PlotOrbitSerieObject(data);
76 case 'spectro' : 76 case 'spectro' :
77 return new amdaPlotObj.PlotSpectroObject(data); 77 return new amdaPlotObj.PlotSpectroObject(data);
78 case 'status-bar' : 78 case 'status-bar' :
js/app/models/RequestParamObject.js
  Diff comments   View file @cec289d
@@ -63,7 +63,10 @@ Ext.define(&#39;amdaModel.RequestParamObject&#39;, { @@ -63,7 +63,10 @@ Ext.define(&#39;amdaModel.RequestParamObject&#39;, {
63 /* Field for arguments of a templated parameter */ 63 /* Field for arguments of a templated parameter */
64 {name: 'template_args', type: 'auto', defaultValue: null}, 64 {name: 'template_args', type: 'auto', defaultValue: null},
65 /* ?? */ 65 /* ?? */
66 - {name: 'plotonly', type: 'bool', defaultValue: false} 66 + {name: 'plotonly', type: 'bool', defaultValue: false},
  67 + {name:'filter_spikes', type:'bool', defaultValue: true},
  68 + {name: 'filter_spikes_factor', type: 'float', defaultValue: 5},
  69 + {name: 'filter_spikes_nPoints', type: 'int', defaultValue: 100}
67 ], 70 ],
68 71
69 getDimSum : function(dim) { 72 getDimSum : function(dim) {
@@ -141,20 +144,24 @@ Ext.define(&#39;amdaModel.RequestParamObject&#39;, { @@ -141,20 +144,24 @@ Ext.define(&#39;amdaModel.RequestParamObject&#39;, {
141 144
142 paramValues['dim1-index'] = this.get('dim1-index'); 145 paramValues['dim1-index'] = this.get('dim1-index');
143 paramValues['dim1-sum-type'] = this.get('dim1-sum-type'); 146 paramValues['dim1-sum-type'] = this.get('dim1-sum-type');
144 - paramValues['dim1-min-value'] = this.get('dim1-min-value');  
145 - paramValues['dim1-max-value'] = this.get('dim1-max-value');  
146 - paramValues['dim1-min-index'] = this.get('dim1-min-index');  
147 - paramValues['dim1-max-index'] = this.get('dim1-max-index'); 147 + paramValues['dim1-min-value'] = this.get('dim1-min-value');
  148 + paramValues['dim1-max-value'] = this.get('dim1-max-value');
  149 + paramValues['dim1-min-index'] = this.get('dim1-min-index');
  150 + paramValues['dim1-max-index'] = this.get('dim1-max-index');
148 151
149 paramValues['dim2-index'] = this.get('dim2-index'); 152 paramValues['dim2-index'] = this.get('dim2-index');
150 paramValues['dim2-sum-type'] = this.get('dim2-sum-type'); 153 paramValues['dim2-sum-type'] = this.get('dim2-sum-type');
151 - paramValues['dim2-min-value'] = this.get('dim2-min-value');  
152 - paramValues['dim2-max-value'] = this.get('dim2-max-value');  
153 - paramValues['dim2-min-index'] = this.get('dim2-min-index');  
154 - paramValues['dim2-max-index'] = this.get('dim2-max-index'); 154 + paramValues['dim2-min-value'] = this.get('dim2-min-value');
  155 + paramValues['dim2-max-value'] = this.get('dim2-max-value');
  156 + paramValues['dim2-min-index'] = this.get('dim2-min-index');
  157 + paramValues['dim2-max-index'] = this.get('dim2-max-index');
155 158
156 - paramValues['type'] = this.get('type');  
157 - paramValues['is-init'] = this.get('is-init'); 159 + paramValues['type'] = this.get('type');
  160 + paramValues['is-init'] = this.get('is-init');
  161 +
  162 + paramValues['filter_spikes'] = this.get('filter_spikes');
  163 + paramValues['filter_spikes_factor'] = this.get('filter_spikes_factor');
  164 + paramValues['filter_spikes_nPoints'] = this.get('filter_spikes_nPoints');
158 165
159 if (this.get('template_args') != null) { 166 if (this.get('template_args') != null) {
160 paramValues['template_args'] = new Object(); 167 paramValues['template_args'] = new Object();