CDPP / AMDA_Kernel

Commit a4dbd36a75712a3ea912440866c6376c6d55a0d6

Authored by Benjamin Renard
2 parents f268e580 e77d0498
Exists in master and in 41 other branches AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, cu2022, das2, density_maps, develop, evol_9042, ubuntu

Merge branch 'master' into amdadev

Showing 4 changed files with 21 additions and 13 deletions   Show diff stats
Inline Side-by-side
CMakeLists.txt
  Diff comments   View file @a4dbd36
... ... @@ -4,7 +4,7 @@ PROJECT(AMDA-Kernel)
4 4  
5 5 SET(CPACK_PACKAGE_VERSION_MAJOR "3")
6 6 SET(CPACK_PACKAGE_VERSION_MINOR "6")
7   -SET(CPACK_PACKAGE_VERSION_PATCH "2")
  7 +SET(CPACK_PACKAGE_VERSION_PATCH "3")
8 8  
9 9 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/)
10 10 set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/)
... ...
src/ExternLib/GetClbInfo/GetClbInfo.hh
  Diff comments   View file @a4dbd36
... ... @@ -109,13 +109,16 @@ public:
109 109 ElementType value = _paramInput.getDataList()[index];
110 110 std::vector<double> calib;
111 111 calib.resize(_maxSize, std::nan(""));
112   - if (!isNAN(value)) {
113   - Parameter::InfoValues* info = _calibrationInfoList[(int)floor(value)];
114   -
115   - int i = 0;
116   - for (std::vector<double>::iterator it = info->begin(); it != info->end(); ++it) {
117   - calib[i] = (*it);
118   - ++i;
  112 + int clb_index = (int)floor(value);
  113 + if (!isNAN(value) && (clb_index >= 0) && (clb_index < _calibrationInfoList.size())) {
  114 + Parameter::InfoValues* info = _calibrationInfoList[clb_index];
  115 +
  116 + if (info != NULL) {
  117 + int i = 0;
  118 + for (std::vector<double>::iterator it = info->begin(); it != info->end(); ++it) {
  119 + calib[i] = (*it);
  120 + ++i;
  121 + }
119 122 }
120 123 }
121 124  
... ...
src/ExternLib/mexvex_els_decode/MexVexElsDecode.hh
  Diff comments   View file @a4dbd36
... ... @@ -58,9 +58,14 @@ public:
58 58 double crtTime = _paramInput.getTime(_index);
59 59 ElemType inputElt = _paramInput.get(_index);
60 60  
61   - int mode = _energyTableInput.get(_index);
62   -
63   - if (mode == 1) {
  61 + short mode = _energyTableInput.get(_index);
  62 +
  63 + if (isNAN(mode)) {
  64 + _paramOutput->pushTime(crtTime);
  65 + inputElt << NotANumber();
  66 + pushDataForMode0Or2(inputElt);
  67 + }
  68 + else if (mode == 1) {
64 69 for (int i = 0; i < 4; ++i){
65 70 _paramOutput->pushTime(crtTime+i);
66 71 pushDataForMode1 (inputElt, i);
... ...
src/ParamOutputImpl/Plot/SpectroNode.hh
  Diff comments   View file @a4dbd36
... ... @@ -118,7 +118,7 @@ namespace plot
118 118 if (value)
119 119 {
120 120 char *newValueBrut = (char *)value;
121   - double newValue = std::stod(newValueBrut);
  121 + double newValue = (strcmp(newValueBrut,"") == 0) ? -1 : std::stod(newValueBrut);
122 122 spectroPropsPtr->setBackgroundSubValue(newValue);
123 123 xmlFree(value);
124 124 }
... ... @@ -131,7 +131,7 @@ namespace plot
131 131 if (value)
132 132 {
133 133 char *newValueBrut = (char *)value;
134   - int newValue = std::stoi(newValueBrut);
  134 + int newValue = (strcmp(newValueBrut, "") == 0) ? 0 : std::stoi(newValueBrut);
135 135 spectroPropsPtr->setBackgroundSubDim(newValue);
136 136 xmlFree(value);
137 137 }
... ...