Merge branch 'develop' into amdadev

Benjamin Renard
2 parents e34e8f45 5482c4a3
Showing 3 changed files with 58 additions and 0 deletions Show diff stats
generic_data/Functions/functions.xml
js/app/views/CalculatorUI.js
js/app/views/ExplorerUI.js
@@ -49,6 +49,34 @@
         <info_brief>skewness() function</info_brief>
         <new_kernel>#skew</new_kernel>
     </function>
+    <function name="covariance_(,,)" args="2" kind="time" group="stat">
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
+        <info_brief>covariance() function for two params</info_brief>
+        <new_kernel>#covariance</new_kernel>
+    </function>
+    <function name="pearson_(,,)" args="2" kind="time" group="stat">
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
+        <info_brief>Pearson coefficient of two parameters</info_brief>
+        <new_kernel>#pearson</new_kernel>
+    </function>
+    <function name="kendall_(,,)" args="2" kind="time" group="stat">
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
+        <info_brief>Kendall coefficient of two parameters</info_brief>
+        <new_kernel>#kendall</new_kernel>
+    </function>
+    <function name="spearman_(,,)" args="2" kind="time" group="stat">
+	<prompts>
+        	<prompt>input window time in secs</prompt>
+	</prompts>
+        <info_brief>Spearman coefficient of two parameters</info_brief>
+        <new_kernel>#spearman</new_kernel>
+    </function>
     <function name="mean_sm_(,)" args="1" kind="sliding" group="stat">
 	<prompts>
         	<prompt>input averaging time in secs</prompt>
@@ -161,6 +189,30 @@
         </info_brief>
         <new_kernel>lopez90</new_kernel>
     </function>
+    <function name="pv_ionos_dn(,)" args="2" kind="model" group="space">
+        <prompt_param></prompt_param>
+        <default_args>alt(Km), sza(Radians)</default_args>
+        <info_brief>
+            Electron Density around Venus &lt;br/&gt;
+            dn = pv_ionos_dn(alt, sza) &lt;br/&gt;
+	    alt is the altitude in Km 
+	    sza is the solat zenith angle in radians 
+            dn is the base 10 log of the model electron density in no/cc
+        </info_brief>
+        <new_kernel>pv_ionos_dn</new_kernel>
+    </function>
+    <function name="pv_ionos_te(,)" args="2" kind="model" group="space">
+        <prompt_param></prompt_param>
+        <default_args>alt(Km), sza(Radians)</default_args>
+        <info_brief>
+            Electron temperature around Venus &lt;br/&gt;
+            te = pv_ionos_dn(alt, sza) &lt;br/&gt;
+            alt is the altitude in Km
+            sza is the solat zenith angle in radians
+            te is in log10 deg K
+        </info_brief>
+        <new_kernel>pv_ionos_te</new_kernel>
+    </function>
     <function name="framesTransformation(,,,)" args="1" kind="frames" group="space">
 	<prompts>
         	<prompt type="list" subtype="frames" default="GSM">Input frame:</prompt>
@@ -681,6 +681,7 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
                 break;
             case 'TimeFunctions' :
                  amdaUI.CalculatorUI.functionStore.filter('kind', 'time');
+		 width = .33;
                 break;
             case 'FunctionsSliding' :
                  amdaUI.CalculatorUI.functionStore.filter('kind', 'sliding');
@@ -970,6 +970,11 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 				}
  
 				this.dockedItems.getAt(1).items.items[0].select(filter['name']);
+			},
+			listeners: {
+				tabchange: function( tabPanel, newCard, oldCard, eOpts ) {
+					tabPanel.down('toolbar').setVisible(newCard.getId() == amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
+				}
 			}
 });