Commit cec289da8493bf7056f15c14ead283dfed43d90b
1 parent
f17b2e35
Exists in
master
and in
82 other branches
attribut rajoute attention defaut true
Showing
3 changed files
with
25 additions
and
14 deletions
Show diff stats
generic_data/Functions/functions.xml
... | ... | @@ -109,7 +109,10 @@ |
109 | 109 | <info_brief>Shifts parameter by T secs back (T < 0) and forth (T > 0))</info_brief> |
110 | 110 | <new_kernel>#timeShift</new_kernel> |
111 | 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 | 116 | <function name="vAlfven(,)" args="2" kind="physics" group="space"> |
114 | 117 | <prompt_param>density[cm^⁻3], b_magnitude[nT]</prompt_param> |
115 | 118 | <info_brief>Alfven velocity Valfven(density[cm^⁻3], b_magnitude[nT])</info_brief> |
... | ... | @@ -274,4 +277,5 @@ |
274 | 277 | <info_brief>Square root</info_brief> |
275 | 278 | <new_kernel>sqrt</new_kernel> |
276 | 279 | </function> |
280 | + | |
277 | 281 | </functions> | ... | ... |
js/app/models/PlotObjects/PlotParamObject.js
... | ... | @@ -71,8 +71,8 @@ Ext.define('amdaPlotObj.PlotParamObject', { |
71 | 71 | { |
72 | 72 | case 'serie' : |
73 | 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 | 76 | case 'spectro' : |
77 | 77 | return new amdaPlotObj.PlotSpectroObject(data); |
78 | 78 | case 'status-bar' : | ... | ... |
js/app/models/RequestParamObject.js
... | ... | @@ -63,7 +63,10 @@ Ext.define('amdaModel.RequestParamObject', { |
63 | 63 | /* Field for arguments of a templated parameter */ |
64 | 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 | 72 | getDimSum : function(dim) { |
... | ... | @@ -141,20 +144,24 @@ Ext.define('amdaModel.RequestParamObject', { |
141 | 144 | |
142 | 145 | paramValues['dim1-index'] = this.get('dim1-index'); |
143 | 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 | 152 | paramValues['dim2-index'] = this.get('dim2-index'); |
150 | 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 | 166 | if (this.get('template_args') != null) { |
160 | 167 | paramValues['template_args'] = new Object(); | ... | ... |