merging master

Hacene SI HADJ MOHAND
2 parents d41a9e66 adb408cd
Showing 27 changed files with 427 additions and 191 deletions Show diff stats
generic_data/Functions/constants.xml
generic_data/Functions/functions.xml
generic_data/compilation/.gitignore
help/plotHOWTO
js/app/models/Constant.js
js/app/models/InteractiveNode.js
js/app/models/LocalParamNode.js
js/app/models/PlotObjects/PlotObjectConfig.js
js/app/models/PlotObjects/PlotPanelObject.js
js/app/models/PlotObjects/PlotParamObject.js
js/app/models/PlotObjects/PlotTabObject.js
js/app/views/CalculatorUI.js
js/app/views/ParamArgumentsPlug.js
js/app/views/ParamArgumentsUI.js
js/app/views/ParameterUI.js
js/app/views/PlotComponents/PlotPanelForm.js
js/app/views/PlotComponents/PlotTree.js
js/resources/css/amda.css
js/resources/images/16x16/circle_orange2_.png
php/classes/AmdaAction.php
 <?xml version="1.0"?>
 <constants>
-  <constant info="astronomical unit" name="AU" units="m">1.49598e+11</constant>
-  <constant info="Boltzmann constant" name="k" units="J/K">1.38054e-23</constant>
-  <constant info="kelvin to electron-volt" name="K2eV" units="eV/K">8.622e-5</constant>
-  <constant info="electron-volt to kelvin" name="eV2K" units="K/eV">1.160e4</constant>
-  <constant info="proton mass" name="m_p" units="kg">1.67e-27</constant>
-  <constant info="electron mass" name="m_e" units="kg">9.1091e-31</constant>
-  <constant info="speed of light in vacuum" name="c" units="m/s">2.99792e+08</constant>
-  <constant info="elementary charge" name="q_e" units="C">1.6021e-19</constant>
-  <constant info='electric constant' name="epsilon_0" units="F/m">8.85416e-12</constant>
-  <constant info='magnetic constant' name="mu_0" units="H/m">1.25664e-06</constant>
-  <constant info="pi" name="pi">3.14159</constant>
-  <constant info="rad2deg" name="rad2deg" units="deg/rad">57.2958</constant>
-  <constant info="deg2rad" name="deg2rad" units="rad/deg">0.0174533</constant>
-  <constant info="gravitational constant" name="G" units="m3/kg/s2">6.674e-11</constant>
-  <constant info="acceleration of gravity at Earth" name="g" units="m/s2">9.81</constant>
-  <constant info="Planck constant" name="h" units="Js">6.626e-34</constant>
-  <constant info="Avogadro number" name="NA" units="1/mol">6.0221367e+23</constant>
-  <constant info="Mercury equatorial radius" name="Rme" units="m">2.4397e+06</constant>
-  <constant info="Venus equatorial radius" name="Rv" units="m">6.0518e+06</constant>
-  <constant info="Earth equatorial radius" name="Re" units="m">6.3712e+06</constant>  
-  <constant info="Mars equatorial radius" name="Rma" units="m">3.3962e+06</constant>
-  <constant info="Jupiter equatorial radius" name="Rj" units="m">71.492e+06</constant>
-  <constant info="Saturn equatorial radius" name="Rs" units="m">60.268e+06</constant>
-  <constant info="Uranus equatorial radius" name="Ru" units="m">25.559+06</constant>
-  <constant info="Neptune equatorial radius" name="Rn" units="m">24.764+06</constant>
-  <constant info="Moon equatorial radius" name="Rmo" units="m">1.738e+06</constant>
-  <constant info="Pluto equatorial radius" name="Rpl" units="m">1.195e+06</constant>
-  <constant info="Sun equatorial radius" name="Rsun" units="m">6.95e+08</constant>
+  <constant info="astronomical unit" name="AU" units="m" kind="space">1.49598e+11</constant>
+  <constant info="Boltzmann constant" name="k" units="J/K" kind="physics">1.38054e-23</constant>
+  <constant info="kelvin to electron-volt" name="K2eV" units="eV/K" kind="units">8.622e-5</constant>
+  <constant info="electron-volt to kelvin" name="eV2K" units="K/eV" kind="units">1.160e4</constant>
+  <constant info="proton mass" name="m_p" units="kg" kind="physics">1.67e-27</constant>
+  <constant info="electron mass" name="m_e" units="kg" kind="physics">9.1091e-31</constant>
+  <constant info="speed of light in vacuum" name="c" units="m/s" kind="physics">2.99792e+08</constant>
+  <constant info="elementary charge" name="q_e" units="C" kind="physics">1.6021e-19</constant>
+  <constant info='electric constant' name="epsilon_0" units="F/m" kind="physics">8.85416e-12</constant>
+  <constant info='magnetic constant' name="mu_0" units="H/m" kind="physics">1.25664e-06</constant>
+  <constant info="pi" name="pi" kind="physics">3.14159</constant>
+  <constant info="rad2deg" name="rad2deg" units="deg/rad" kind="units">57.2958</constant>
+  <constant info="deg2rad" name="deg2rad" units="rad/deg" kind="units">0.0174533</constant>
+  <constant info="gravitational constant" name="G" units="m3/kg/s2" kind="physics">6.674e-11</constant>
+  <constant info="acceleration of gravity at Earth" name="g" units="m/s2" kind="physics">9.81</constant>
+  <constant info="Planck constant" name="h" units="Js" kind="physics">6.626e-34</constant>
+  <constant info="Avogadro number" name="NA" units="1/mol" kind="physics">6.0221367e+23</constant>
+  <constant info="Mercury equatorial radius" name="Rme" units="m" kind="space">2.4397e+06</constant>
+  <constant info="Venus equatorial radius" name="Rv" units="m" kind="space">6.0518e+06</constant>
+  <constant info="Earth equatorial radius" name="Re" units="m" kind="space" >6.3712e+06</constant>  
+  <constant info="Mars equatorial radius" name="Rma" units="m" kind="space">3.3962e+06</constant>
+  <constant info="Jupiter equatorial radius" name="Rj" units="m" kind="space">71.492e+06</constant>
+  <constant info="Saturn equatorial radius" name="Rs" units="m" kind="space">60.268e+06</constant>
+  <constant info="Uranus equatorial radius" name="Ru" units="m" kind="space">25.559+06</constant>
+  <constant info="Neptune equatorial radius" name="Rn" units="m" kind="space">24.764+06</constant>
+  <constant info="Moon equatorial radius" name="Rmo" units="m" kind="space">1.738e+06</constant>
+  <constant info="Pluto equatorial radius" name="Rpl" units="m" kind="space">1.195e+06</constant>
+  <constant info="Sun equatorial radius" name="Rsun" units="m" kind="space">6.95e+08</constant>
+  <constant info="Ganymede (Jupiter moon) mean radius" name="Rga" units="m" kind="space">2.634e+06</constant>
+  <constant info="Io (Jupiter moon) mean radius" name="Rio" units="m" kind="space">1.822e+06</constant>
+  <constant info="Callisto(Jupiter moon)  mean radius" name="Rca" units="m" kind="space">2.410e+06</constant>
+  <constant info="Europa (Jupiter moon) mean radius" name="Reu" units="m" kind="space">1.561e+06</constant>
+  <constant info="Titan (Saturn moon) mean radius" name="Rti" units="m" kind="space">2.575e+06</constant>
+  <constant info="Enceladus (Saturn moon) mean radius" name="Renc" units="m" kind="space">2.52e+05</constant>
 </constants>
@@ -88,14 +88,18 @@
      <prompt/>
      <info_brief>GSE to SM transformation</info_brief>
    </function>-->
-   <function name="cross(,)" params="2" kind="math">
+   <function name="cross(,)" params="2" kind="vectors">
      <info_brief>Cross product</info_brief>
      <new_kernel>cross</new_kernel>
    </function>
-   <function name="dot(,)" params="2" kind="math">
+   <function name="dot(,)" params="2" kind="vectors">
      <info_brief>Dot product</info_brief>
      <new_kernel>dot</new_kernel>
    </function>
+	<function name="module()" kind="vectors">
+		<info_brief>Magnitude</info_brief>
+     <new_kernel>magnitude</new_kernel>
+   </function>
    <function name="abs()" kind="math">
      <info_brief>Absolute value</info_brief>
 	  <new_kernel>abs</new_kernel>
@@ -0,0 +1,2 @@
+*
+!.gitignore
 <li>1. To plot a parameter <i>drag</i> it from the Parameters tree and <i>drop</i> onto the panel  
 <li>2. <i>Link to MultiPlot</i> replaces the individual plot tab TimeSelector with the common for all plot tabs "MultiTime" Selector 
-<li>3. <i>Simplified View</i> hides all request elements except <i>panel</i> and <i>parameter</i>
+<li>3. Check <i>Extended Plot Options</i> to get control over all available plot options
 \ No newline at end of file
@@ -20,6 +20,7 @@ Ext.define(&#39;amdaModel.Constant&#39;, {
   fields : [
 	{name: 'name', mapping: '@name', type:'string'},
+	{name: 'kind', mapping: '@kind', type: 'string', defaultValue: 'space'},
 	{name: 'info', mapping: '@info', type:'string'},
 	{name: 'units', mapping: '@units', type: 'string', defaultValue: ''},
 	{name: 'value', mapping: ' ', type: 'string'}
@@ -28,8 +28,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 	statics: {
 		preloadNodes : function(node,onready)
 		{
-			var me = this;
-			
+			var me = this;	
 			var nodesToLoad = new Array();
 			nodesToLoad.push(node);
 			this.preloadTreeNode(node, nodesToLoad, function (node)
@@ -131,7 +130,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 				}       	 
 				module.setContextNode(contextNode); 
-			} else if (module.getLinkedNode() != null){	
+			} else if (module.getLinkedNode() != null){
 			//TODO the node to edit is already edited
 				// myDesktopApp.warningMsg('This object is  being edited');
 				//Sol1: msg alert: "warning this node is already edited! If you want to get the original, please press the 'reset' button"->'OK'
@@ -237,7 +236,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 		if (!this.get('contextNode') || (this.get('contextNode').data.id == 'sharedtimeTable-treeRootNode') || (this.get('contextNode').data.id == 'sharedcatalog-treeRootNode')) {
 			// set the root node of 'Derived Parameters' tree as contextNode
 			this.set('contextNode',this.getRootNode());
-		}        
+		} 
 		// call the Ext.Direct method to create parameter 
 		AmdaAction.createObject(this.get('object').getJsonValues(false), this.get('contextNode').get('id'), function(res,e){          
 			//success
@@ -258,12 +257,13 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					} 
 					// set text of this node
 					this.set('text',this.get('object').get('name'));
+
 					//set id of this node
 					this.set('id',res.id);
 					this.internalId = res.id;
+
 					// set id of node's object
-					this.get('object').set('id',res.id);
-                    
+					this.get('object').set('id',res.id);    
 					if (res.created){
 						// set the created date
 						this.get('object').set('created',res.created);
@@ -577,45 +577,54 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					if (this.parentNode) {
 						if (this.isLeaf()){
 							var moduleId = this.get('moduleId');
-							// if really interactive node
+							// if really interactive node 
 							if (moduleId) {
-								var me = this;
-								myDesktopApp.getLoadedModule(moduleId, true, function (module) {
-									var editedNode = module.getLinkedNode();
-								// file node is not linked directly to the module				    
-								var isThisFile = false;
-							
-								if (editedNode && editedNode.$className == 'amdaModel.MyDataParamNode')                                        
-									if (editedNode.get('fileObject').get('fileName') == me.get('text'))
-										isThisFile = true;  
-                                        
-								if (me.$className == 'amdaModel.DerivedParamNode')
-								{
-									var obj = {
-										paramId : 'ws_'+me.get('text')
-									};
-									AmdaAction.compilParamDelete(obj);
-								}
-                                        	
-								if (editedNode === me || isThisFile){
-									var newNode = Ext.ModelManager.create({leaf : true}, me.$className);
-									// several tabs could be connected to one node
-									if (moduleId === myDesktopApp.dynamicModules.plot.id) {
-										var linkedNodes = module.linkedNodes;
-																																		
-										if (linkedNodes) {
-											linkedNodes.each(function(key, value){						      
-												if (value === me) {	 
-													linkedNodes.replace(key,newNode);
-													var tabPanel = module.getUiContent().tabPanel.items.getByKey(key);
-													tabPanel.setObject(Ext.create(amdaModel.Plot.$className, {}));						 
-												}	
-											}, me);
-										}					  					 	
-									} 
-									newNode.editInModule();
+								var win = myDesktopApp.getDesktop().getWindow(moduleId);
+								// if window is really open
+								if (win) {
+									var me = this;
+									myDesktopApp.getLoadedModule(moduleId, true, function (module) {
+										var editedNode = module.getLinkedNode();
+										
+										// file node is not linked directly to the module				    
+										var isThisFile = false;
+										if (editedNode && editedNode.$className == 'amdaModel.MyDataParamNode')                                        
+											if (editedNode.get('fileObject').get('fileName') == me.get('text'))
+												isThisFile = true; 
+											
+										// node was created BEFORE tree loading; node.id are different ; but it is the same node 
+										if ( editedNode && editedNode.get('id') == me.get('id') && editedNode !== me ) {
+											module.setLinkedNode(me);
+											isThisFile = true;
+										}
+										
+										if (me.$className == 'amdaModel.DerivedParamNode') {
+											var obj = {
+												paramId : 'ws_'+me.get('text')
+											};
+											AmdaAction.compilParamDelete(obj);
+										}
+										
+										if (editedNode === me || isThisFile ){  
+											var newNode = Ext.ModelManager.create({leaf : true}, me.$className);
+											// several tabs could be connected to one node
+											if (moduleId === myDesktopApp.dynamicModules.plot.id) {
+												var linkedNodes = module.linkedNodes;
+																																				
+												if (linkedNodes) {
+													linkedNodes.each(function(key, value){						      
+														if (value === me) {	 
+															linkedNodes.replace(key,newNode);
+															var tabPanel = module.getUiContent().tabPanel.items.getByKey(key);
+															tabPanel.setObject(Ext.create(amdaModel.Plot.$className, {}));						 
+														}	
+													}, me);
+												}					  					 	
+											} 
+											newNode.editInModule();
+										}
+									});	
 								}
-								});				                                        
 							}
 						}                    
 						//update mask info in myData              
@@ -65,6 +65,9 @@ Ext.define(&#39;amdaModel.LocalParamNode&#39;,
 			if (this.get('isStack') || this.get('isSpectra'))
 				this.set('iconCls', 'icon-spectra');
+		
+			if (this.get('is2dSpectra'))
+				this.set('iconCls', 'icon-2dspectra');
 		}
 	},
@@ -23,7 +23,7 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 			oneFilePerInterval: false
 		},
 		tree : {
-			simplifiedView : true
+			fullView : false
 		},
 		page : {
 			xMargin : 5.,
@@ -280,7 +280,7 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     	}
     },
-    createNewParam: function(paramId, paramComponents, isVector, plotOnly, onAfterCreate) {
+    createNewParam: function(paramId, paramComponents, isVector, is2d, plotOnly, onAfterCreate) {
     	this.set('last-param-id', this.get('last-param-id') + 1);
     	var emptyPanel = (this.params().getCount() == 0);
@@ -304,7 +304,9 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     			recs[0].set('dim2-index', paramComponents['index2']);
     		}
     	}
-    	 
+        
+    	if (is2d)
+                            recs[0].set('dim2-index','0'); 
     	// activate legend if vector & TimePlot
     	if ( isVector && this.get('panel-plot-type') == 'timePlot' ) {
 			this.loadSeriesLegend();
@@ -58,6 +58,7 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
     		return;
     	this.set('param-drawing-object', this.createDrawingObjectByType(this.get('param-drawing-type'), drawing));
     	drawingObject.dirty = false;
+	 
     },
     createDrawingObjectByType : function(type, data)
@@ -27,7 +27,7 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
 	fields : [
 	          {name: 'id', type: 'int'},
-	          {name: 'tree-simplified-view', type: 'boolean'},
+	          {name: 'tree-full-view', type: 'boolean'},
 	          {name: 'multi-plot-linked', type: 'boolean'},
 	          {name: 'page-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
 	          {name: 'panels-node-state', type: 'int', defaultValue: 2},  //0 : collapsed, 1 : expanded, 2 : not set
@@ -153,7 +153,7 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
     setDefaultValues: function()
     {
-    	this.set('tree-simplified-view', amdaPlotObj.PlotObjectConfig.defaultValues.tree.simplifiedView);
+    	this.set('tree-full-view', amdaPlotObj.PlotObjectConfig.defaultValues.tree.fullView);
     	this.set('multi-plot-linked', false);
@@ -223,7 +223,7 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
     	var tabValues  = new Object();
     	tabValues['id'] = this.get('id');
-    	tabValues['tree-simplified-view'] = this.get('tree-simplified-view');
+    	tabValues['tree-full-view'] = this.get('tree-full-view');
     	tabValues['multi-plot-linked'] = this.get('multi-plot-linked');
     	tabValues['page-node-state'] = this.get('page-node-state');
     	tabValues['panels-node-state'] = this.get('panels-node-state');
@@ -15,6 +15,7 @@
  */
 var CalculatorData = ['1','2','3','4','5','6','7','8','9','0','(',')','[',']','+','-','*','/','^', '.','>','<', '&', '|'];
+// var CalculatorData = ['1','2','3','4','5','6','7','8','9','0','(',')','[',']','+','-','*','/','^', '.','>','>=', '=', '<=', '<', '&', '|'];
 Ext.define('amdaUI.CalculatorUI', {
 	extend: 'Ext.util.Observable',
@@ -93,12 +94,12 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
 				scope   : this,
 				callback: function(records, operation, success) 
 				{
-				this.createConstantBtns();
+				this.createAllConstantBtns();
 				}
 			});
 		}
 		else
-			this.createConstantBtns();
+			this.createAllConstantBtns();
 		//load functions store
 		if (!amdaUI.CalculatorUI.functionStore)
@@ -148,8 +149,10 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
 				defaults: { xtype: 'button', columnWidth: .11},
 				items: this.getItems('Calculator')
 			} , {
-				title: 'Constants', layout: 'column',
-				defaults: { xtype: 'button', columnWidth: .20},
+				title: 'Constants', xtype:'tabpanel', //iconCls: 'tabs',
+				enableTabScroll: true,	tabPosition: 'bottom',	
+				defaults: { frame: true, border: false, plain: true, layout: 'column', autoScroll:true},
+				activeTab: 0, 
 				id : 'calc_tab_const_id'
 			}, {
 				title: 'Functions', xtype:'tabpanel', //iconCls: 'tabs',
@@ -337,14 +340,50 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
 	  return btns;
 	},
-	createConstantBtns : function(){
+	createAllFunctionBtns : function()
+	{
+		this.createFunctionBtns('MathFunctions','Simple Maths');	
+		this.createFunctionBtns('VectorFunctions','Vector Functions');
+		this.createFunctionBtns('TimeFunctions','Statistics');
+		this.createFunctionBtns('FunctionsSliding','Statistics/Sliding');
+		this.createFunctionBtns('AmdaFunctions','Special');
+	},
+	
+	createAllConstantBtns : function()
+	{
+		this.createConstantBtns('Space','Planets Constants');	
+		this.createConstantBtns('Physics','Physics Constants');
+		this.createConstantBtns('Units','Units Conversion');
+	},
+	
+	createConstantBtns : function(item, tabTitle)
+	{
 		var constTab = this.win.query('#calc_tab_const_id');
-		
+		  
 		if (constTab.length < 1)
-			return;
-	  
+		  return;
+		
+		switch (item) 
+		{
+		  case 'Space' :
+			  amdaUI.CalculatorUI.constantStore.filter('kind','space');
+		    break;
+		  case 'Physics' :
+			  amdaUI.CalculatorUI.constantStore.filter('kind','physics');  
+			break;
+		  case 'Units' :
+			  amdaUI.CalculatorUI.constantStore.filter('kind','units'); 
+			  break;
+		}
+		
+		 var crtTab = constTab[0].add(
+				{
+					title : tabTitle,
+					defaults: { xtype: 'button',  columnWidth: .20}
+				});
+		 
 		amdaUI.CalculatorUI.constantStore.each( function(c){
-			constTab[0].add(
+			crtTab.add(
 			{
 				text: c.get('name'),
 				tooltip: c.get('units') == '' ? c.get('info')+'<br/>'+c.get('value') :
@@ -365,15 +404,10 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
 				}
 			});
 	  },this);
-	},
-	
-	createAllFunctionBtns : function()
-	{
-		this.createFunctionBtns('MathFunctions','Simple Maths');	  	
-		this.createFunctionBtns('TimeFunctions','Statistics');
-		this.createFunctionBtns('FunctionsSliding','Statistics/Sliding');
-		this.createFunctionBtns('AmdaFunctions','Space Physics');
-	},
+		
+		//clear filter
+		amdaUI.CalculatorUI.constantStore.clearFilter();    
+	},	
 	createFunctionBtns : function(item, tabTitle)
 	{
@@ -396,6 +430,9 @@ Ext.define(&#39;amdaUI.CalculatorUI&#39;, {
 		  case 'FunctionsSliding' :
 			  amdaUI.CalculatorUI.functionStore.filter('kind','sliding'); 
 		    break;
+		case 'VectorFunctions' :
+			  amdaUI.CalculatorUI.functionStore.filter('kind','vector'); 
+		    break;
 		}
 		var crtTab = funcTab[0].add(
@@ -66,7 +66,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsPlug&#39;, {
     	{
     		this.win = new Ext.Window({
     			id: prefixId + '-param-arg-win',
-    			width: 200,
+    			width: 280,
     			height: 150,       
     			x: 0, y: 0,                
     			baseCls:'x-panel',                
@@ -19,7 +19,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 	onChange: null,
 	onModifyHeight: null,
 	pluginOwner: null,
-	
+	isFirstMsg : true,
 	// -1 -> unknown, 0 -> scalar, 1 -> Tab1D, 2 -> Tab2D
 	paramType: 0,
@@ -59,6 +59,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
     	}
     	else
     		me.unmask();
+
     },
     rebuildAll: function(paramInfoResult , uiScope) {
@@ -211,7 +212,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 					indexes.push({'key' : component.index_2, 'value' : index + ' : ' + component.name});
 			});
 		}
-		
+
 		//Add combo box
 		var indexesStore = Ext.create('Ext.data.Store', {
 		    fields: ['key', 'value'],
@@ -224,13 +225,29 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 		    queryMode: 'local',
 		    displayField: 'value',
 		    valueField: 'key',
-		    value: '*',
+			 value: '*',
 		    editable: false,
 		    argId: relatedDim,
 		    hidden: (relatedTable ? relatedTable.variable : false),
 		    listeners: {
             	change: function(field, newValue, oldValue, eOpts) {
-            		this.paramRequestObject.set(relatedDim+'-index', newValue);
+						if (this.paramRequestObject.get('type') == '2' && this.isFirstMsg) 
+						{
+							if (field.argId == 'dim2' &&  newValue == '*') { 
+								var previousCombo = field.previousSibling();
+								
+								if (previousCombo instanceof Ext.form.FieldSet)  
+									previousCombo = previousCombo.previousSibling();
+								
+									if (previousCombo instanceof Ext.form.ComboBox && previousCombo.argId == 'dim1' && previousCombo.getValue() == '*' && !previousCombo.isDisabled()) {
+										myDesktopApp.warningMsg('If argument <i>All</i> is set for both dimensions output will be the total sum <b>(not spectra!)</b>');
+										this.isFirstMsg = false;
+									}
+								
+							}
+						}
+						
+            		this.paramRequestObject.set(relatedDim+'-index', newValue); 
             		if (this.onChange != null)
             			this.onChange(uiScope, relatedDim, newValue, oldValue, false);
             	},
@@ -49,8 +49,9 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
 	addParam : function(newParamName, isLeaf, needArgs, components) 
 	{
 		//if (!isLeaf || needArgs || components)
-		//	this.editParameterArgs(newParamName, components);
-		//else
+		if ( needArgs )
+			this.editParameterArgs(newParamName, components);
+		else
 			this.addParamInEditor(newParamName);
 	},
@@ -119,7 +119,7 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, {
 		        	if (value != me.object.get('panel-plot-type'))
 		        	{
 		        		me.object.changePlotType(value);
-		        		if (!me.crtTree.tabObject.get('tree-simplified-view'))
+		        		if (me.crtTree.tabObject.get('tree-full-view'))
 		        		{
 		        			me.crtTree.buildPanelAxesNode(me.object);
 		        			me.crtTree.buildPanelAdditionalObjectsNode(me.object);
@@ -46,15 +46,11 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 			this.store.getRootNode().removeAll();
 		this.tabObject = tabObject;
-		
-		this.simplifiedViewCombo.setValue(this.tabObject.get('tree-simplified-view'));
-		this.linkToMultiPlotCombo.setValue(this.tabObject.get('multi-plot-linked'));
-		
-		if (!this.tabObject.get('tree-simplified-view'))
+			
+		if (this.tabObject.get('tree-full-view') && this.simplifiedViewCombo.getValue())
 		{
 			//Page Node
 			var pageNode = this.store.getRootNode().appendChild(new amdaPlotObj.PlotPageTreeNode({object : tabObject}));
-		
 			//Layout node
 			pageNode.appendChild(new amdaPlotObj.PlotLayoutTreeNode({object : tabObject}));
@@ -63,8 +59,12 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 		}
 		else
 			this.panelsNode = this.store.getRootNode();
-		
+
+		this.suspendLayouts();
 		this.buildPanelsNode();
+		this.simplifiedViewCombo.setValue(this.tabObject.get('tree-full-view'));
+		this.linkToMultiPlotCombo.setValue(this.tabObject.get('multi-plot-linked'));
+		this.resumeLayouts(true);
 	},
 	buildPanelsNode: function(paramNodeToSelect) {
@@ -137,7 +137,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 			//Retrieve corresponding panel node
 			if (panelNode.object == panelObject)
 			{
-				if (!me.tabObject.get('tree-simplified-view'))
+				if (me.tabObject.get('tree-full-view'))
 				{
 					//Retrieve params node
 					paramsNode = panelNode.findChild('type', 'params');
@@ -283,7 +283,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 	addPanelNode: function(panelObject, paramNodeToSelect) {
 		var panelNode = this.panelsNode.appendChild(new amdaPlotObj.PlotPanelTreeNode({object : panelObject}));
-		if (!this.tabObject.get('tree-simplified-view'))
+		if (this.tabObject.get('tree-full-view'))
 		{
 			//Axes node
 			this.buildPanelAxesNode(panelObject);
@@ -337,7 +337,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 		var toIndex   = targetNode.parentNode.indexOf(targetNode);
 		var fromPanelObject = null;
- 		if (!this.tabObject.get('tree-simplified-view'))
+ 		if (this.tabObject.get('tree-full-view'))
 		{
 			fromPanelObject = record.parentNode.parentNode.object;
 		}
@@ -374,7 +374,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
  			return true;
  		case 'amdaPlotObj.PlotParamTreeNode' :
  			var toPanelObject = null;
- 			if (!this.tabObject.get('tree-simplified-view'))
+ 			if (this.tabObject.get('tree-full-view'))
 			{
  				toPanelObject = targetNode.parentNode.parentNode.object;
 			}
@@ -453,7 +453,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 				break;
 			case 'param' :
 				var panelObject = null;
-				if (!this.tabObject.get('tree-simplified-view'))
+				if (this.tabObject.get('tree-full-view'))
 					panelObject = record.parentNode.parentNode.object;
 				else
 					panelObject = record.parentNode.object;
@@ -463,7 +463,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 				break;
 			case 'text-legend' :
 				var panelObject = null;
-				if (!this.tabObject.get('tree-simplified-view'))
+				if (this.tabObject.get('tree-full-view'))
 					panelObject = record.parentNode.parentNode.object;
 				else
 					panelObject = record.parentNode.object;
@@ -472,7 +472,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 				break;
 			case 'constant' :
 				var panelObject = null;
-				if (!this.tabObject.get('tree-simplified-view'))
+				if (this.tabObject.get('tree-full-view'))
 					panelObject = record.parentNode.parentNode.object;
 				else
 					panelObject = record.parentNode.object;
@@ -481,7 +481,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 				break;
 			case 'text-obj' :
 				var panelObject = null;
-				if (!this.tabObject.get('tree-simplified-view'))
+				if (this.tabObject.get('tree-full-view'))
 					panelObject = record.parentNode.parentNode.object;
 				else
 					panelObject = record.parentNode.object;
@@ -490,7 +490,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 				break;
 			case 'curve' :
 				var panelObject = null;
-				if (!this.tabObject.get('tree-simplified-view'))
+				if (this.tabObject.get('tree-full-view'))
 					panelObject = record.parentNode.parentNode.object;
 				else
 					panelObject = record.parentNode.object;
@@ -499,7 +499,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 				break;
 			case 'fill' :
 				var panelObject = null;
-				if (!this.tabObject.get('tree-simplified-view'))
+				if (this.tabObject.get('tree-full-view'))
 					panelObject = record.parentNode.parentNode.object;
 				else
 					panelObject = record.parentNode.object;
@@ -565,7 +565,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
     	 	case 'amdaPlotObj.PlotParamTreeNode' :
     	 		var fromPanelObject = null;
-    	 		if (!this.tabObject.get('tree-simplified-view'))
+    	 		if (this.tabObject.get('tree-full-view'))
 				{
 					fromPanelObject = record.parentNode.parentNode.object;
 				}
@@ -582,7 +582,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
     	 			toPanelObject = targetNode.object;
     	 			break;
     	 		case 'amdaPlotObj.PlotParamTreeNode' :
-    	 			if (!this.tabObject.get('tree-simplified-view'))
+    	 			if (this.tabObject.get('tree-full-view'))
     				{
     	 				toPanelObject = targetNode.parentNode.parentNode.object;
     				}
@@ -607,7 +607,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 		return false;
 	},
-                            dropParamToCreate: function (targetNode, position, paramId, paramComponents, isVector, plotOnly)
+                            dropParamToCreate: function (targetNode, position, paramId, paramComponents, isVector, is2d, plotOnly)
                             {
                                 var panelObject = null;
                                 if (targetNode == null)
@@ -640,7 +640,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
                                 //Create param object
                                 var me = this;
-                                panelObject.createNewParam(paramId, paramComponents, isVector, plotOnly, function (newParamObject) {
+                                panelObject.createNewParam(paramId, paramComponents, isVector, is2d, plotOnly, function (newParamObject) {
                                     //Rebuild params node
                                     me.buildPanelsNode(newParamObject.getId());
                                     //BRE newParamObject
@@ -669,6 +669,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
                                             this.dropParamToCreate(targetNode, position, "#" + record.get('alias'));
                                         else {
                                             var isVector = record.get('iconCls') == 'icon-vector';
+                                            var is2d = record.get('iconCls') == 'icon-2dspectra'; 
                                             var component_info = record.get('component_info');
                                             var param_id = record.get('id');
                                             var plot_only = record.get('notyet');
@@ -682,7 +683,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
                                                 if (component_info.index2)
                                                     components['index2'] = component_info.index2;
                                             }
-                                            this.dropParamToCreate(targetNode, position, param_id, components, isVector, plot_only);
+                                            this.dropParamToCreate(targetNode, position, param_id, components, isVector, is2d, plot_only);
                                         }
                                         return true;
                                     case 'amdaModel.AliasNode'        :
@@ -845,7 +846,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 	init : function(config) {
 		var me = this;
-		
+	 
 		this.plotElementPanel = config.plotElementPanel;
 		var store = Ext.create('Ext.data.TreeStore', {
@@ -854,15 +855,22 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 		    }
 		});
-		this.plotElementPanel = config.plotElementPanel;
+	//	this.plotElementPanel = config.plotElementPanel;
 		this.simplifiedViewCombo = Ext.create('Ext.form.field.Checkbox', {
 			xtype: 'checkbox',
-			boxLabel: 'Simplified View',
+			boxLabel: 'Extended Plot Options',
 			listeners: {
+// 				 render: function(c) {
+// 					Ext.create('Ext.tip.ToolTip', {
+// 						target: c.getEl(),
+// 						html: "SOME TEXT" 
+// 					});
+// 				},
 				change: function(combo, newValue, oldValue, eOpts) {
 					if (this.tabObject)
-			        	this.tabObject.set('tree-simplified-view', newValue);
+			        	this.tabObject.set('tree-full-view', newValue);
+					 
 					if (newValue != oldValue)
 						this.buildTree(this.tabObject);
 				},
@@ -937,13 +945,13 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 			        	   },
 			        	   scope: this
 			           },
-			           '->',
+			           '-', '->',
 			           this.linkToMultiPlotCombo,
 			           ' ',
 			           this.simplifiedViewCombo
 			    ]
 		};
-		Ext.apply (this , Ext.apply (arguments, myConf));
+		Ext.apply(this,Ext.apply(arguments, myConf));
 	}
-});
 \ No newline at end of file
+});
@@ -329,6 +329,12 @@ background-image: url(../images/16x16/error.png) !important;
      background-repeat: no-repeat;
 }
+.icon-2dspectra {
+     background-image:url(../images/16x16/circle_orange2_.png) !important;
+     background-position: center;
+     background-repeat: no-repeat;
+}
+
 .icon-unknowntype {
      background-image:url(../images/14x14/circle_grey.png) !important;
      background-position: center;
@@ -228,6 +228,7 @@ class AmdaAction
 							$isParameter = false;
 							$needsArgs = false;
 							$isSpectra = false;
+							$is2dSpectra = false;
 							$isStack = false;
 							$not_yet = false;
@@ -237,12 +238,16 @@ class AmdaAction
 								if ($child->hasAttribute('dataStart') && $child->hasAttribute('dataStop')) {
 									$info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop');
+									
+									if ($child->hasAttribute('lastUpdate')) {
+										$info .= "<br/>Last Updated: : ".$child->getAttribute('lastUpdate');
+									}
 								}
 								if ($child->getAttribute('dataStart') == 'depending on mission') {
 									$info .= "<br/>Time Range: ".$child->getAttribute('dataStart');
 								}
-
+	
 // 								if ($child->getAttribute('restriction') > 1) {
 // 									$restricted  = $child->getAttribute('restriction');
 // 									$info .= "<br/><b>Time Restriction</b>: -$restricted days";
@@ -300,6 +305,8 @@ class AmdaAction
 								if ($child->getAttribute('display_type') == 'spectrogram') {
 										$needsArgs = true;
 										$isSpectra = true;
+										if (strpos($child->getAttribute('name'),'2D') !== false)
+											$is2dSpectra = true;
 								}
 								elseif ($child->getAttribute('display_type') == 'stackplot') {
 										$isStack = true;
@@ -313,8 +320,8 @@ class AmdaAction
 								$childrenToReturn[] = array('text' => $name,'alias' => $alias,
 									'id' => $id,'nodeType' => $nodeType, 'info' => $info, "component_info" => $component_info,
 									'globalStart' => $globalStart, 'globalStop' => $globalStop, 'timeRestriction' => $timeRestriction,
-									'leaf' => $isLeaf, 'isParameter' => $isParameter,
-									'isSpectra' => $isSpectra,'isStack' => $isStack, 'needsArgs' => $needsArgs, 'help' => $help, 'notyet' => $not_yet);
+									'leaf' => $isLeaf, 'isParameter' => $isParameter,'isSpectra' => $isSpectra,
+									'is2dSpectra' => $is2dSpectra,'isStack' => $isStack, 'needsArgs' => $needsArgs, 'help' => $help, 'notyet' => $not_yet);
 							}
 							else {
 								if ($child->tagName == 'mission' || $child->tagName == 'observatory') {
@@ -80,6 +80,43 @@ abstract class SharedObjectMgrAbstract {
 		return array('success' => TRUE, 'object_id' => $newId);
 	}
+
+	public function delete($folder_name, $objectId) {
+		$dst_folder_path = $this->getFolderDirPath($folder_name);
+		if (!is_dir($dst_folder_path))
+			return array('success' => false, 'message' => 'Cannot get folder path');
+
+		$dst_header_path = $this->getHeaderDirPath($folder_name);
+		if (is_dir($dst_header_path)) {
+			$headerFilePath   = $this->getHeaderFilePath($folder_name, $objectId);
+			if (is_file($headerFilePath)) {
+				unlink($headerFilePath);
+			}
+		}
+
+		$dst_data_path = $this->getDataDirPath($folder_name);
+		if (is_dir($dst_data_path)) {
+			$dataFilePath = $this->getDataFilePath($folder_name, $objectId);
+			if (is_file($dataFilePath)) {
+				unlink($dataFilePath);
+			}
+		}
+
+		return array('success' => TRUE, 'object_id' => $objectId);
+	}
+
+	public function createFolder($folder_name) {
+		$folder_path = $this->getFolderDirPath($folder_name);
+		if (is_dir($folder_path)) {
+			return FALSE;
+		}
+
+		mkdir($folder_path);
+		chgrp($folder_path, APACHE_USER);
+		chmod($folder_path, 0775);
+
+		return is_dir($folder_path);
+	}
 	public function getRootDirPath() {
 		return SHAREDPATH . "/" . $this->rootdirname;
@@ -158,4 +195,4 @@ abstract class SharedObjectMgrAbstract {
 	}
 }
-?>
 \ No newline at end of file
+?>
@@ -50,9 +50,32 @@ class SharedObjectTreeFile  {
 					$objectNode->setAttribute($key, $value);
 			}
 		}
-		
+		$this->doc->save($this->getFilePath());
 		//Remove obsolete folders and objects
+		$folders = $this->getFolders($object_type);
+		foreach ($folders as $folder) {
+			$folderNode = $this->getObjectFolderNode($object_type, $folder["name"]);
+			if (!isset($folderNode)) {
+				continue;
+			}
+			if (!array_key_exists($folder["name"], $objects)) {
+				$folderNode->parentNode->removeChild($folderNode);
+			}
+			else {
+				$objectNodes = $folderNode->getElementsByTagName($object_type);
+				$to_remove = array();
+				foreach ($objectNodes as $objectNode) {
+					$idAtt = $objectNode->getAttribute('xml:id');
+					if (!in_array($idAtt, $objects[$folder["name"]])) {
+						$to_remove[] = $objectNode;
+					}
+				}
+				foreach ($to_remove as $node) {
+					$folderNode->removeChild($node);
+				}
+			}
+		}
 		$this->doc->save($this->getFilePath());
@@ -162,6 +185,34 @@ class SharedObjectTreeFile  {
 		}
 		return "";
 	}
+
+	public function getObjectsByName($object_type, $folder_name, $object_name) {
+		$folderNode = $this->getObjectFolderNode($object_type, $folder_name);
+
+		if (!isset($folderNode))
+			return NULL;
+
+		$objectNodes = $folderNode->getElementsByTagName($object_type);
+
+		$result = array();
+		foreach ($objectNodes as $objectNode) {
+			if ($objectNode->getAttribute('name') == $object_name)
+				$result[] = $objectNode->getAttribute("xml:id");
+		}
+
+		return $result;
+	}
+
+	public function deleteObjectByObjectId($object_type, $folder_name, $object_id) {
+		$node = $this->getObjectNode($object_type, $folder_name, $object_id);
+		if (!isset($node)) {
+			return array('success' => FALSE, 'message' => 'Cannot retrieve object node in tree');
+		}
+		$node->parentNode->removeChild($node);
+		$this->doc->save($this->getFilePath());
+
+		return array('success' => TRUE);
+	}
 	private function init() {
 		if (!file_exists($this->getFilePath()))
@@ -260,7 +311,7 @@ class SharedObjectTreeFile  {
 		return NULL;
 	}
-	
+
 	private function createObjectNode($object_type, $folder_name, $object_id) {
 		$listNode = $this->getObjectListNode($object_type);
@@ -50,6 +50,29 @@ class SharedObjectsMgr  {
 		return $result;
 	}
+
+	public function update($object_type, $object_name, $folder_id, $src_object_path, $description, $sharedBy) {
+		if (!array_key_exists($object_type, $this->sharedObjectsMgr) || !isset($this->sharedObjectsMgr[$object_type]))
+			return array('success' => FALSE, 'message' => 'Unknown type');
+
+		$folder_name = $this->treeFile->getFolderNameById($object_type, $folder_id);
+
+		if (empty($folder_name))
+			return array('success' => FALSE, 'message' => 'Cannot retrieve folder');
+
+		$objects = $this->treeFile->getObjectsByName($object_type, $folder_name, $object_name);
+
+		if (!empty($objects)) {
+			//delete old objects
+			foreach ($objects as $object_id) {
+				$result = $this->treeFile->deleteObjectByObjectId($object_type, $folder_name, $object_id);
+				$result = $this->sharedObjectsMgr[$object_type]->delete($folder_name, $object_id);
+			}
+		}
+
+		//add new object
+		return $this->add($object_type, $object_name, $folder_id, $src_object_path, $description, $sharedBy);
+	}
 	public function getFolders($object_type) {
 		if (!array_key_exists($object_type, $this->sharedObjectsMgr) || !isset($this->sharedObjectsMgr[$object_type]))
@@ -57,6 +80,18 @@ class SharedObjectsMgr  {
 		return $this->treeFile->getFolders($object_type);
 	}
+
+	public function createFolder($object_type, $folder_name) {
+		if (!array_key_exists($object_type, $this->sharedObjectsMgr) || !isset($this->sharedObjectsMgr[$object_type])) {
+			return array('success' => FALSE, 'message' => 'Unknown type');
+		}
+
+		if (!$this->sharedObjectsMgr[$object_type]->createFolder($folder_name)) {
+			return array('success' => FALSE, 'message' => 'Cannot create folder '.$folder_name);
+		}
+
+		return $this->updateTree();
+	}
 	public function isNameAlreadyUsed($object_type, $name) {
 		if (!array_key_exists($object_type, $this->sharedObjectsMgr) || !isset($this->sharedObjectsMgr[$object_type]))
@@ -96,4 +131,4 @@ class SharedObjectsMgr  {
 	}
 }
-?>
 \ No newline at end of file
+?>
@@ -276,9 +276,9 @@ class UserMgr
 					else {
 						// totally rewrite
 						if ($base->hasAttribute('isSimulation')) {
-							/*$centerNode = $this->makeSimulationBase($baseId);
+							$centerNode = $this->makeSimulationBase($baseId);
 							$center = new $baseId();
-							$centerNode->setAttribute('available', $center->monitor());*/
+							$centerNode->setAttribute('available', $center->monitor());
 						}
 						else {
 							$center = new $baseId();
@@ -334,18 +334,19 @@ class UserMgr
 			$this->paramMgr->xmlDom->formatOutput = true;
 			$this->paramMgr->xmlDom->preserveWhiteSpace = false;
-             
+
 			$BASE = $this->paramMgr->xmlDom->createElement('dataRoot'); 
 			$BASE->setAttribute('xml:id','myRemoteData-treeRootNode');
 			foreach ($this->paramMgr->Bases as $baseId) 
 			{    
 				$centerNode = $this->makeNewBase($baseId);
-				$BASE->appendChild($centerNode);  
+				if (isset($centerNode))
+					$BASE->appendChild($centerNode);  
 			} 
-			
+
 			$this->paramMgr->xmlDom->appendChild($BASE);
-			
+
 			return $this->paramMgr->xmlDom->save($this->paramMgr->xmlName);
 	   }  
 	}
@@ -353,11 +354,11 @@ class UserMgr
 	protected function makeNewBase($baseId)
 	{
 	// no data base description ; skip this data base  
-		if (!@file_exists(RemoteData.$baseId.'/base.xml')) return;
+		if (!@file_exists(RemoteData.$baseId.'/base.xml')) return NULL;
 		// can't read base.xml ; skip this data base
-		if (!@$this->baseExtXml->load(RemoteData.$baseId.'/base.xml')) return;
-		
+		if (!@$this->baseExtXml->load(RemoteData.$baseId.'/base.xml')) return NULL;
+
 		$base = $this->paramMgr->basesDom->getElementById($baseId);
 		if ($base->hasAttribute('default'))  
@@ -527,7 +528,7 @@ class UserMgr
 	public function init() 
-	{
+	{ 
 		if ($this->ddLogin() != 0) 
 			die('<h2>You are trying to log in as '.$this->user.'<br/> Please check that you entered a valid password</h2>');
@@ -573,12 +574,11 @@ class UserMgr
 		$this->setPath(); 		
 		$this->userGrps = $this->getUserGrps();
-
+		  		
 		if (!$this->makeLocalTree())
 				die("Login for ".$this->user." failed: Can't make LocalParams.xml");;
-		//$ok = $this->makeRemoteTree();	                      		
-
-//die("BRE");
+		
+		$ok = $this->makeRemoteTree();	                      		
 		if (!file_exists(USERWSDIR.'Request.xml')) $reqMgr = new RequestMgr();
 		if (!file_exists(USERWSDIR.'Tt.xml')) $ttMgr = new TimeTableMgr();
@@ -87,6 +87,7 @@ define(&#39;RemoteData&#39;, DATAPATH.&#39;/RemoteData/&#39;);
 define('Functions', DATAPATH.'/Functions/');
 define('Hst', DATAPATH.'/Hst/');
 define('SpecialSettingsDir',DATAPATH.'/SpecialSettings/');
+define('CommonLib', DATAPATH.'/compilation/lib/');
 // General Info files
 define('orbitsXml',LocalData.'/Orbites.xml');
@@ -35,7 +35,8 @@ do
     if [ -e $PARAM_INFO_PATH/$info_file ]
      then
-       echo ${param_filename} exists
+       #echo ${param_filename} exists
+       temp=a
      else
       echo "Generate info file for ${param_filename}"           
       php $UPDATEDIR/preprocessInfo.php ${param_filename}         
@@ -48,39 +49,40 @@ if [ ! -e ./app.properties ]; then
 	exit
 fi
-if [ -e ./app.properties.temp ]; then
-	# rm ./app.properties.temp
-	echo "Seems ./app.properties has been modified already"  
-else
-	while read line  
-		do
-			
-			if [[ $line == app.param.path* ]]; then
-				line="app.param.path="$NEWMETA"final/"
-			fi
-			
-			if [[ $line == app.dataSetInfo.path* ]]; then
-				line="app.dataSetInfo.path="$NEWMETA"datasets/"
-			fi
-			
-			if [[ $line == app.user.name* ]]; then
-				line="app.user.name="$DDUSER
-			fi
-			
-			if [[ $line == app.plugin* ]]; then
-				line="app.plugin=./../build/"$KERNEL_BUILD_TYPE"/plugin/"
-			fi	
-			
-			if [[ $line == app.process.LIB* ]]; then
-				line="app.process.LIB=-L../build/"$KERNEL_BUILD_TYPE"/lib/ -lParameters"
-			fi	
-			
-			echo $line >> ./app.properties.temp
-					
-		done < <(cat $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties)
+# if [ -e ./app.properties.temp ]; then
+# 	# rm ./app.properties.temp
+# 	echo "Seems ./app.properties has been modified already"  
+# else
+# modify app.properties in any case !
+while read line  
+	do
-	cp  ./app.properties.temp $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties
-fi 
+		if [[ $line == app.param.path* ]]; then
+			line="app.param.path="$NEWMETA"final/"
+		fi
+		
+		if [[ $line == app.dataSetInfo.path* ]]; then
+			line="app.dataSetInfo.path="$NEWMETA"datasets/"
+		fi
+		
+		if [[ $line == app.user.name* ]]; then
+			line="app.user.name="$DDUSER
+		fi
+		
+		if [[ $line == app.plugin* ]]; then
+			line="app.plugin=./../build/"$KERNEL_BUILD_TYPE"/plugin/"
+		fi	
+		
+		if [[ $line == app.process.LIB* ]]; then
+			line="app.process.LIB=-L../build/"$KERNEL_BUILD_TYPE"/lib/ -lParameters"
+		fi	
+		
+		echo $line >> ./app.properties.temp
+				
+	done < <(cat $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties)
+	
+cp  ./app.properties.temp $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties
+#fi 
 DDLogin $DDUSER $DDPASS
@@ -92,7 +94,8 @@ do
     if [ -e $NEWMETA/ParamInfo/$info_file ]
      then
-       echo ${param_filename} exists
+       # echo ${param_filename} exists
+       temp=a
      else
       echo "Generate info file for ${param_filename}"
       amdaParameterInfo -p ${param_filename}
@@ -101,7 +101,7 @@
 				cp $RemoteData/PARAMS/* $PARAMS_LOCALDB_DIR/
 			fi 
 	fi
-		# Update StartStop only	
+		# Update StartStop & Help only	
 	if [ $UPDATE ]
 		then
 			echo "Updating...."
@@ -114,6 +114,11 @@
 			fi
 			echo 'update in NEWMETA/dd_missions: done'
+			echo 'update in NEWMETA/help: done'
+			
+			cp $NEWMETA/help/*  $HelpAuto
+			
+			echo "copy  $NEWMETA/help/ to $HelpAuto : done" 
 			echo "making Tree..."
 			php $UPDATEDIR/makeTree.php