Merge branch 'master' into amdadev

Benjamin Renard
2 parents f268e580 e77d0498
Showing 4 changed files with 21 additions and 13 deletions Show diff stats
CMakeLists.txt
src/ExternLib/GetClbInfo/GetClbInfo.hh
src/ExternLib/mexvex_els_decode/MexVexElsDecode.hh
src/ParamOutputImpl/Plot/SpectroNode.hh
@@ -4,7 +4,7 @@ PROJECT(AMDA-Kernel)
 SET(CPACK_PACKAGE_VERSION_MAJOR "3")
 SET(CPACK_PACKAGE_VERSION_MINOR "6")
-SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_PACKAGE_VERSION_PATCH "3")
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/)
 set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/)
@@ -109,13 +109,16 @@ public:
 	ElementType value = _paramInput.getDataList()[index];
 	std::vector<double> calib;
 	calib.resize(_maxSize, std::nan(""));
-	if (!isNAN(value)) {
-		Parameter::InfoValues* info = _calibrationInfoList[(int)floor(value)];
-
-		int i = 0;
-		for (std::vector<double>::iterator it = info->begin(); it != info->end(); ++it) {
-			calib[i]  = (*it);
-			++i;
+	int clb_index = (int)floor(value);
+	if (!isNAN(value) && (clb_index >= 0) && (clb_index < _calibrationInfoList.size())) {
+		Parameter::InfoValues* info = _calibrationInfoList[clb_index];
+
+		if (info != NULL) {
+			int i = 0;
+			for (std::vector<double>::iterator it = info->begin(); it != info->end(); ++it) {
+				calib[i]  = (*it);
+				++i;
+			}
 		}
 	}
@@ -58,9 +58,14 @@ public:
 			double crtTime = _paramInput.getTime(_index);
 			ElemType inputElt = _paramInput.get(_index);
-			int mode = _energyTableInput.get(_index);
-	     
-			if (mode == 1) {
+			short mode = _energyTableInput.get(_index);
+
+			if (isNAN(mode)) {
+				_paramOutput->pushTime(crtTime);
+				inputElt << NotANumber();
+				pushDataForMode0Or2(inputElt);
+			}
+			else if (mode == 1) {
 				for (int i = 0; i < 4; ++i){			       
 					_paramOutput->pushTime(crtTime+i);
 					pushDataForMode1 (inputElt, i);				 
@@ -118,7 +118,7 @@ namespace plot
 			if (value)
 			{
 				char *newValueBrut = (char *)value;
-				double newValue = std::stod(newValueBrut);
+				double newValue = (strcmp(newValueBrut,"") == 0) ? -1 : std::stod(newValueBrut);
 				spectroPropsPtr->setBackgroundSubValue(newValue);
 				xmlFree(value);
 			}
@@ -131,7 +131,7 @@ namespace plot
 			if (value)
 			{
 				char *newValueBrut = (char *)value;
-				int newValue = std::stoi(newValueBrut);
+				int newValue = (strcmp(newValueBrut, "") == 0) ? 0 : std::stoi(newValueBrut);
 				spectroPropsPtr->setBackgroundSubDim(newValue);
 				xmlFree(value);
 			}