Table definition with only center defined (min max bounds are automatically computed)

Fix a bug in DD_SetTimeInfo Fix "total" function to not sum NaN componants Stereo A SWEA-PAD parameter definition

Table definition with only center defined (min max bounds are automatically computed)
Fix a bug in DD_SetTimeInfo Fix "total" function to not sum NaN componants Stereo A SWEA-PAD parameter definition
Benjamin Renard
1 parent 47e87499
Showing 11 changed files with 334 additions and 7 deletions Show diff stats
config/DataBaseParameters/cass_caps_snghr5.xml
config/DataBaseParameters/sta_swea_pad.xml
config/DataBaseParameters/sta_swea_pad_tab2d.xml
config/DataBaseParameters/xsd/info/paramInfo.xsd
src/DD_Client_r_Lib/DD_client.cc
src/Info/ParamTable.cc
src/Info/ParamTable.hh
src/Info/ParamTableNode.cc
src/ParamGetImpl/DDServerInterface/ParamGetDDBase.cc
src/ParamGetImpl/DDServerInterface/Pusher.hh
src/Parameters/DataTypeMath.hh
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<param xml:id="cass_caps_snghr5">
+  <info>
+  	<name>Energy-time spectrogram of ion count rates observed by anode 5</name>
+	<short_name>CAPS SNG Anode 5</short_name>
+	<components></components>
+	<units>counts.s-1</units>
+	<coordinates_system></coordinates_system>
+	<tensor_order>1</tensor_order>
+	<si_conversion></si_conversion>
+	<table>
+  		<boundsTable name="Energy" boundsName="Energy" units="eV"/>
+  	</table>
+	<fill_value>-1.0e+31</fill_value>
+	<ucd>phys.count;phys.atmol.ionStage;arith.rate</ucd>
+	<dataset_id></dataset_id>
+  </info>
+  <gap_threshold>8</gap_threshold>
+  <get>
+	<vi name="cass:caps:snghr">
+		<baseParam name="SNG_ANODE5_PER_SEC">
+			<clb name="Energy"/>
+		</baseParam>
+	</vi>
+  </get>
+  <process/>
+  <output/>
+</param>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<param xml:id="sta_swea_pad">
+  <info>
+  	<name>Stereo-A SWEA PAD Total under all energies</name>
+	<short_name>SWEA PAD Total under all energies</short_name>
+	<components></components>
+	<units>s3/km6</units>
+	<coordinates_system></coordinates_system>
+	<tensor_order>0</tensor_order>
+	<si_conversion></si_conversion>
+	<table>
+  		<centerTable name="PA" centerName="PitchAngles" size="15" units="deg."/>
+  	</table>
+	<fill_value>-1e+31</fill_value>
+	<ucd></ucd>
+	<dataset_id></dataset_id>
+  </info>
+  <get>
+  <amdaParam name="sta_swea_pad_tab2d"/>
+  </get>
+  <process description="total(sta_swea_pad_tab2d,2)">total($sta_swea_pad_tab2d,2)</process>
+  <output/>
+</param>
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<param xml:id="sta_swea_pad_tab2d">
+  <info>
+  	<name>Stereo-A SWEA PAD</name>
+	<short_name>SWEA PAD</short_name>
+	<components></components>
+	<units>s3/km6</units>
+	<coordinates_system></coordinates_system>
+	<tensor_order>0</tensor_order>
+	<si_conversion></si_conversion>
+	<table>
+  		<centerTable dim="0" name="PA" centerName="PitchAngles" size="15" units="deg."/>
+  		<centerAutoTable dim="1" name="Energy" units="eV" centerName="ETab0" log="false"/>
+  	</table>
+	<fill_value>-1e+31</fill_value>
+	<ucd></ucd>
+	<dataset_id></dataset_id>
+  </info>
+  <get> 
+  <vi name="sta:swea:pad">
+	<baseParam name="PAD250">
+		<clb name="PitchAngles"/>
+		<clb name="ETab0"/>
+		<clb name="ETab1"/>
+	</baseParam>
+  </vi>
+  </get>
+  <process/>
+  <output/>
+</param>
@@ -50,6 +50,14 @@
 		</xs:complexType>
 	</xs:element>
  
+	<xs:element name="centerAutoTable" substitutionGroup="TableDef">
+		<xs:complexType>
+			<xs:attributeGroup ref="TableGroup" />
+			<xs:attribute name="centerName" type="xs:string" use="required" />
+			<xs:attribute name="log" type="xs:boolean" use="required" />
+		</xs:complexType>
+	</xs:element>
+	
 	<xs:attributeGroup name="StatusGroup">
       <xs:attribute name="minVal" type="xs:double" />
       <xs:attribute name="maxVal" type="xs:double" />
@@ -589,7 +589,12 @@ int DD_Client:: DD_SetTimeInfo(int VarID, char *Time, double *RealTime)
     }
  
     *RealTime = DD_Time2Double((char *)data->Variables[0]);
- 
+
+    //BRE - When the corresponding time is the last one of a file, MOREDATA is returned by DDServer.
+    // => force recall of DD_GetData to open the next file and finish correctly the request
+    if (err == MOREDATA)
+       	err = DD_GetData(VarID, (char *)"Time", TimeInt, &data);
+
    return 1 ;
 }
  
@@ -212,6 +212,110 @@ t_TableBound ParamCenterWidthTable::getBound(ParameterManager *parameterManager,
 	return bound;
 }
  
+ParamCenterAutoTable::ParamCenterAutoTable(const char *paramId, const char *centerName, bool log) :
+		ParamTable(paramId), _centerName(centerName), _log(log)
+{
+}
+
+/*
+ * @brief Get size of the table
+ */
+int ParamCenterAutoTable::getSize(ParameterManager *parameterManager)
+{
+	ParameterSPtr tmpParam = parameterManager->getParameter(_paramId);
+	AMDA::Parameters::Parameter::InfoList lInfoList = tmpParam->getInfoList();
+	AMDA::Parameters::Parameter::InfoValuesSPtr pTableInfo = lInfoList[_centerName];
+	return pTableInfo->size();
+}
+
+/*
+ * @brief Get a bound for a specified index
+ */
+t_TableBound ParamCenterAutoTable::getBound(ParameterManager *parameterManager, unsigned int index)
+{
+	ParameterSPtr tmpParam = parameterManager->getParameter(_paramId);
+
+	t_TableBound bound;
+	bound.index = index;
+
+	if (tmpParam == nullptr)
+	{
+		LOG4CXX_ERROR(_logger, "Associated parameter not reachable!");
+		bound.min = index;
+		bound.max = index+1;
+		return bound;
+	}
+
+	//get table info from parameter info list
+
+	AMDA::Parameters::Parameter::InfoList lInfoList = tmpParam->getInfoList();
+	AMDA::Parameters::Parameter::InfoValuesSPtr pTableInfo = lInfoList[_centerName];
+
+	if (index >= pTableInfo->size())
+	{
+		LOG4CXX_ERROR(_logger, "Index " << index << " outside of table definition => Cannot get real bound" );
+		bound.min = index;
+		bound.max = index+1;
+		return bound;
+	}
+
+	//Compute bounds
+
+	if (pTableInfo->size() <= 1)
+	{
+		LOG4CXX_ERROR(_logger, "Table dimension too small to compute bound" );
+		bound.min = index;
+		bound.max = index+1;
+		return bound;
+	}
+
+	double minus = 0.;
+	double plus  = 0.;
+
+	if (index == 0)
+	{
+		if (_log)
+			plus  = exp((log10((*pTableInfo)[1]) - log10((*pTableInfo)[0]))/2.);
+		else
+			plus  = ((*pTableInfo)[1] - (*pTableInfo)[0])/2.;
+		minus = plus;
+	}
+	else if (index == pTableInfo->size() - 1)
+	{
+		if (_log)
+			minus = exp((log10((*pTableInfo)[pTableInfo->size() - 1]) - log10((*pTableInfo)[pTableInfo->size() - 2]))/2.);
+		else
+			minus = ((*pTableInfo)[pTableInfo->size() - 1] - (*pTableInfo)[pTableInfo->size() - 2])/2.;
+		plus  = minus;
+
+	}
+	else
+	{
+		if (_log)
+		{
+			minus = exp((log10((*pTableInfo)[index]) - log10((*pTableInfo)[index-1]))/2.);
+			plus  = exp((log10((*pTableInfo)[index+1]) - log10((*pTableInfo)[index]))/2.);
+		}
+		else
+		{
+			minus = ((*pTableInfo)[index] - (*pTableInfo)[index-1])/2.;
+			plus  = ((*pTableInfo)[index+1] - (*pTableInfo)[index])/2.;
+		}
+	}
+
+	bound.min = (*pTableInfo)[index] - minus;
+	bound.max = (*pTableInfo)[index] + plus;
+
+	if (bound.min > bound.max)
+	{
+		double temp = bound.max;
+		bound.max = bound.min;
+		bound.min = temp;
+	}
+
+	return bound;
+}
+
 ParamMinMaxTable::ParamMinMaxTable(const char *paramId, const char *minName, const char *maxName) :
 										ParamTable(paramId), _minName(minName), _maxName(maxName)
 {
@@ -117,6 +117,24 @@ namespace Info {
 	};
  
 	/**
+	 * @class ParamCenterAutoTable
+	 * @brief Implementation of a ParamTable for a table defined by a list of center value. Bounds automatically computed to be at the center of two consecutive channels
+	 * @details
+	 */
+	class ParamCenterAutoTable : public ParamTable {
+	public:
+		ParamCenterAutoTable(const char *paramId, const char *centerName, bool log);
+
+		virtual int getSize(ParameterManager *parameterManager);
+
+		virtual t_TableBound getBound(ParameterManager *parameterManager, unsigned int index);
+
+	private:
+		std::string _centerName;
+		bool _log;
+	};
+
+	/**
 	 * @class ParamMinMaxTable
 	 * @brief Implementation of a ParamTable for a table defined by two list: one for min and one for max
 	 * @details
@@ -329,6 +329,80 @@ public:
 };
  
 /*
+ * @brief Center table node - Bounds automatically computed to be at the center of two consecutive channels
+ */
+class CenterAutoTable: public AMDA::XMLConfigurator::NodeCfg {
+public:
+	void proceed( xmlNodePtr pNode, const AMDA::Parameters::CfgContext& context) {
+		LOG4CXX_DEBUG(gLogger, "CenterAutoTable::proceed");
+
+		ParamInfo* pParamInfo =  context.get<ParamInfo*>();
+
+		std::string paramId =  pParamInfo->getId();
+
+		//Get name
+		xmlChar* value = xmlGetProp(pNode, (const xmlChar *) "name");
+		std::string name;
+		if (value != NULL)
+		{
+			name = (char *)value;
+			xmlFree(value);
+		}
+
+		//Get units
+		value = xmlGetProp(pNode, (const xmlChar *) "units");
+		std::string units;
+		if (value != NULL)
+		{
+			units = (char *)value;
+			xmlFree(value);
+		}
+
+		//Get dim
+		value = xmlGetProp(pNode, (const xmlChar *) "dim");
+		int dim = 0;
+		if (value != NULL)
+		{
+			dim = atoi((char *)value);
+			xmlFree(value);
+		}
+
+		xmlChar* lcenterName  = NULL;
+		xmlChar* llog  = NULL;
+		try {
+			if (!(lcenterName = xmlGetProp(pNode, (const xmlChar *) "centerName"))) {
+				ERROR_EXCEPTION(
+						ERROR_MANDATORY_ATTRIBUTE_MISSING << pNode->name << "@centerName")
+			}
+
+			LOG4CXX_DEBUG(gLogger, "CenterAutoTable::proceed - Center name : " << lcenterName);
+
+			bool isLog = false;
+			if ((llog = xmlGetProp(pNode, (const xmlChar *) "log"))) {
+				isLog = (strcmp((char*)llog, "true") == 0);
+				xmlFree(llog);
+			}
+
+			boost::shared_ptr<ParamTable> table(new ParamCenterAutoTable(
+					paramId.c_str(), (const char*)lcenterName, isLog));
+
+			table->setName(name);
+			table->setUnits(units);
+
+			pParamInfo->addTable(dim, table);
+		} catch (...) {
+			if (lcenterName) {
+				xmlFree(lcenterName);
+			}
+			throw;
+		}
+		if (lcenterName) {
+			xmlFree(lcenterName);
+		}
+	}
+};
+
+/*
  * @brief table node
  */
 ParamTableNode::ParamTableNode() : AMDA::XMLConfigurator::NodeGrpCfg()
@@ -337,6 +411,7 @@ ParamTableNode::ParamTableNode() : AMDA::XMLConfigurator::NodeGrpCfg()
 	getChildList()["minMaxTable"]=NodeCfgSPtr(new MinMaxTable);
 	getChildList()["centerTable"]=NodeCfgSPtr(new CenterTable);
 	getChildList()["centerWidthTable"]=NodeCfgSPtr(new CenterWidthTable);
+	getChildList()["centerAutoTable"]=NodeCfgSPtr(new CenterAutoTable);
 }
  
 ParamTableNode::~ParamTableNode()
@@ -53,6 +53,12 @@ namespace AMDA {
 			_vi = VirtualInstrumentManager::getInstance()->getVirtualInstrument(
 					_viName);
 			_pusher = _vi->getParamPusher(_parName);
+			//Param info
+			AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(_parameter.getInfoId(),true);
+			if ((paramInfo != nullptr) && (isnan(_pusher->getFillValue())) && (!isnan(paramInfo->getFillValue())))
+			{
+				_pusher->setFillValue(paramInfo->getFillValue());
+			}
 			_paramData = ParamDataSPtr(_pusher->_paramData);
 			_paramData->setMinSampling(_vi->getMinSampling());
  
@@ -30,6 +30,9 @@ namespace Base {
 		void setFillValue(double pFillValue) {
 			_fillValue = pFillValue;
 		}
+		double getFillValue() {
+			return _fillValue;
+		}
 		int _dim1; /*!< Used for vector and Tab2D */
 		int _dim2; /*!< Used for Tab2D */
 		ParamData* _paramData; /*!< return ParamData to a Process*/
@@ -962,11 +962,20 @@ AMDA::Parameters::Tab2DData&lt;Type1&gt; operator /(const AMDA::Parameters::Tab2DData&lt;
 template <typename Type>
 Type total(const AMDA::Parameters::Tab2DData<Type>& a)
 {
-	Type sum = 0;
+	Type sum;
+	sum << NotANumber();
  
 	for(int i = 0; i < a.getDim1Size(); ++i)
 		for(int j = 0; j < a.getDim2Size(); ++j)
-			sum += a[i][j];
+		{
+			if (isFinite(a[i][j]))
+			{
+				if (isNAN(sum))
+					sum = a[i][j];
+				else
+					sum += a[i][j];
+			}
+		}
 	return sum;
 }
  
@@ -985,18 +994,36 @@ std::vector&lt;Type&gt; total(const AMDA::Parameters::Tab2DData&lt;Type&gt;&amp; a,int mode)
 	case 1 :
 		for(int j = 0; j < a.getDim2Size(); ++j)
 		{
-			Type elem = 0;
+			Type elem;
+			elem << NotANumber();
 			for(int i = 0; i < a.getDim1Size(); ++i)
-				elem += a[i][j];
+			{
+				if (isFinite(a[i][j]))
+				{
+					if (isNAN(elem))
+						elem = a[i][j];
+					else
+						elem += a[i][j];
+				}
+			}
 			sum.push_back(elem);
 		}
 		break;
 	case 2 :
 		for(int i = 0; i < a.getDim1Size(); ++i)
 		{
-			Type elem = 0;
+			Type elem;
+			elem << NotANumber();
 			for(int j = 0; j < a.getDim2Size(); ++j)
-				elem += a[i][j];
+			{
+				if (isFinite(a[i][j]))
+				{
+					if (isNAN(elem))
+						elem = a[i][j];
+					else
+						elem += a[i][j];
+				}
+			}
 			sum.push_back(elem);
 		}
 		break;