CDPP / AMDA_Kernel

Commit 8cd29beedbc4faad88d51621cb5586c530ed81ba

Authored by Benjamin Renard
1 parent 7740f037
Exists in master and in 50 other branches 10098, 5390, 7616, 9016Bis, 9084, 9326, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, 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_6598, 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, test-merge, ubuntu

Fix #10035

Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
Inline Side-by-side
CMakeLists.txt
  Diff comments   View file @8cd29be
... ... @@ -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 "0")
  7 +SET(CPACK_PACKAGE_VERSION_PATCH "1")
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/ParamGetImpl/DDServerInterface/VirtualInstrument.cc
  Diff comments   View file @8cd29be
... ... @@ -224,6 +224,16 @@ namespace DDServerInterface {
224 224 sleep(2);
225 225 error = lDDClient.DD_SetTime(lId, startTime);
226 226 }
  227 + if (error == NODATAATTIME) {
  228 + // In some case, GlobalStart can be not exactly the real first time's record of a dataset...
  229 + int offset = 0;
  230 + while (error == NODATAATTIME && offset < 60) {
  231 + ++offset;
  232 + LOG4CXX_DEBUG(gLogger, "VirtualInstrument::getParamPusher: DD_SetTime("<< startTime << ") returns = (" << error << ")");
  233 + Double2DD_Time(startTime,_globalStartTime+offset);
  234 + error = lDDClient.DD_SetTime(lId, startTime);
  235 + }
  236 + }
227 237 if (error < 0)
228 238 {
229 239 lDDClient.DD_Close(lId);
... ...