Merge branch 'amdadev'

Benjamin Renard
2 parents 090b0d11 4793fd6e
Showing 7 changed files with 146 additions and 19 deletions Show diff stats
generic_data/Functions/functions.xml
generic_data/Functions/functions_args_list.xml
js/app/views/CalculatorUI.js
js/app/views/CatalogUI.js
js/app/views/ExplorerUI.js
js/app/views/TimeTableUI.js
php/classes/AmdaStats.php
@@ -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>
@@ -114,11 +142,37 @@
         <info_brief>Remove Spikes ( ! Experimental ! ) : filter(param, factor,nPoints)</info_brief>
         <new_kernel>#filter</new_kernel>
     </function>
+    <function name="BCain(,)" args="2" kind="model" group="space">
+        <default_args>"",mag</default_args>
+        <info_brief>Cain model for Mars Magnetic Field</info_brief>
+        <new_kernel>#bcain</new_kernel>
+    </function>
     <function name="vAlfven(,)" args="2" kind="physics" group="space">
         <prompt_param>density[cm^⁻3], b_magnitude[nT]</prompt_param>
         <info_brief>Alfven velocity Valfven(density[cm^⁻3], b_magnitude[nT])</info_brief>
         <new_kernel>alfvenVelocity</new_kernel>
     </function>
+    <function name="mlt_maglib(,)" args="1" kind="physics" group="space">
+        <prompts>
+                <prompt type="list" subtype="external_fields" default="1">External field:</prompt>
+        </prompts>
+        <info_brief>Compute MLT from geographical spacecraft position (cartesian coordinates and in Earth radius)</info_brief>
+        <new_kernel>#maglib_mlt</new_kernel>
+    </function>
+    <function name="invlat_maglib(,)" args="1" kind="physics" group="space">
+        <prompts>
+                <prompt type="list" subtype="external_fields" default="1">External field:</prompt>
+        </prompts>
+        <info_brief>Compute InvLat from geographical spacecraft position (cartesian coordinates and in Earth radius)</info_brief>
+        <new_kernel>#maglib_invlat</new_kernel>
+    </function>
+    <function name="lparam_maglib(,)" args="1" kind="physics" group="space">
+        <prompts>
+                <prompt type="list" subtype="external_fields" default="1">External field:</prompt>
+        </prompts>
+        <info_brief>Compute L Param from geographical spacecraft position (cartesian coordinates and in Earth radius)</info_brief>
+        <new_kernel>#maglib_lparam</new_kernel>
+    </function>
  
      <function name="perreault78(,,)" args="3" kind="model" group="space">
         <info_brief>Perreault and Akasofu 1978 model u = perreault78(E_mag, B_mag, theta_p)</info_brief>
@@ -156,11 +210,35 @@
         </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>
         	<prompt type="list" subtype="frames" default="GSE">Output frame:</prompt>
-                <prompt type="boolean">The vector represent a position in space?</prompt>
+                <prompt type="boolean">The vector represents a position in space</prompt>
 	</prompts>
         <info_brief>Frames transformation</info_brief>
         <new_kernel>#framesTransformation</new_kernel>
@@ -32,4 +32,11 @@
 			<value key="VSO" value="VSO" info="Venus Solar Orbital"/>
 		</values>
     </arglist>
+    <arglist id="external_fields">
+		<values>
+			<value key="1" value="Tsyganenko 87"/>
+			<value key="2" value="Tsyganenko 89"/>
+			<value key="3" value="Kosik 97"/>
+                </values>
+    </arglist>
 </argslist>
@@ -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');
@@ -409,7 +409,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     hidden: true,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '1',
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -429,7 +429,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     hidden: true,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '2',
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -449,7 +449,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     hidden: false,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '3',
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -469,7 +469,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     hidden: true,
                     id: amdaUI.CatalogUI.COL_TO_HIDE_DURATION + '4',
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return Ext.util.Format.number(value, '0.000');
                     },
                     listeners: {
                         beforeshow: function () {
@@ -939,6 +939,24 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
             frame: true,
             columnLines: true,
             selModel: {pruneRemoved: false},
+            
+          countDecimals: function (value) {
+                if (Math.floor(value) === value)
+                    return 0;
+                return value.toString().split(".")[1].length || 0;
+            },
+            
+            dateToString: function (value) {
+                ndegits = this.countDecimals(value);
+                if (ndegits <= 3) {
+                    return  Ext.util.Format.number(value, '0.000');
+                } else if (value < 0.1) {
+                    return value.toExponential(3);
+                } else {
+                    return Ext.util.Format.number(value, '0.000000');
+                }
+            },
+            
             //	selType: 'cellmodel',
             plugins: [cellEditing, {ptype: 'bufferedrenderer'}],
             listeners: {
@@ -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);
+				}
 			}
 });
  
@@ -383,8 +383,8 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
     convertUTCDateToLocalDate: function (date) {
         if (date == null) {
             return date;
-        }
-        ;
+        };
+         
         var newDate = new Date(date.getTime() + date.getTimezoneOffset() * 60 * 1000);
  
         var offset = date.getTimezoneOffset() / 60;
@@ -514,7 +514,6 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                 {type: 'date', dataIndex: 'stop', dateFormat: 'Y-m-d'}
             ]
         };
-
         var cellEditing = Ext.create('Ext.grid.plugin.CellEditing', {
             onEditComplete: function (ed, value, startValue) {
                 var me = this,
@@ -580,6 +579,23 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
             features: [filters],
             columnLines: true,
             selModel: {pruneRemoved: false},
+
+            countDecimals: function (value) {
+                if (Math.floor(value) === value)
+                    return 0;
+                return value.toString().split(".")[1].length || 0;
+            },
+            
+            dateToString: function (value) {
+                ndegits = this.countDecimals(value);
+                if (ndegits <= 3) {
+                    return  Ext.util.Format.number(value, '0.000');
+                } else if (value < 0.1) {
+                    return value.toExponential(3);
+                } else {
+                    return Ext.util.Format.number(value, '0.000000');
+                }
+            },
             columns: [
                 {
                     xtype: 'rownumberer',
@@ -624,13 +640,12 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                         }
                     }
                 },
-                    {
+                {
                     header: 'Duration (day)', width: 120, dataIndex: 'durationDay',
                     id: amdaUI.TimeTableUI.COL_TO_HIDE + '1',
                     hidden: true,
                     renderer: function (value) {
-                       
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -652,7 +667,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                     id: amdaUI.TimeTableUI.COL_TO_HIDE + '2',
                     hidden: true,
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -673,7 +688,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                     header: 'Duration (min)', width: 120, dataIndex: 'durationMin',
                     id: amdaUI.TimeTableUI.COL_TO_HIDE + '3',
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return this.dateToString(value);
                     },
                     listeners: {
                         beforeshow: function () {
@@ -695,7 +710,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                     id: amdaUI.TimeTableUI.COL_TO_HIDE + '4',
                     hidden: true,
                     renderer: function (value) {
-                        return Ext.util.Format.number(value, '0.00');
+                        return Ext.util.Format.number(value, '0.000');
                     },
                     listeners: {
                         beforeshow: function () {
@@ -786,7 +801,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                         this.fireEvent("refresh");
                     }
                 }
-                
+
             }
         });
  
@@ -16,13 +16,13 @@ class AmdaStats {
 	private $task = array('request'=>'plot','condition'=>'mining', 'download'=>'print','statistic'=>'statistics',
 				'getparameter'=>'ws_print', 'getdataset' => 'ws_print', 'getorbites' => 'ws_print', 'getplot' => 'ws_plot');
  
-	public function __construct($user) {
+	public function __construct($user, $year = NULL) {
 		if (!is_dir(DATAPATH.'Statistics')) {
 			if (!mkdir(DATAPATH.'Statistics', 0775)) $this->success = false; //return -1;
 			if (!chgrp(DATAPATH.'Statistics', APACHE_USER)) $this->success = false; // return -1;
 		}
  
-		$this->statsFilePath = $this->getStatsFilePath($user);
+		$this->statsFilePath = $this->getStatsFilePath($user, $year);
 	}
  
 	public function addTask($user, $task, $vars) {
@@ -45,8 +45,11 @@ class AmdaStats {
 		return $this->concurrentAccessGuestFile(array($this,'_mergeStats'), array('inXml' => $inXml));
 	}
  
-	private function getStatsFilePath($user) {
-		$thisYear = date("Y");
+	private function getStatsFilePath($user, $year) {
+		if (!isset($year))
+			$thisYear = date("Y");
+		else
+			$thisYear = $year;
 		if (empty($user)){		
 			return DATAPATH."Statistics/Stats$thisYear.xml";
 		}