CDPP / AMDA_Kernel

Commit a40aa27895deadd718a5ad30038e3233d9b199a1

Authored by Benjamin Renard
1 parent a46daa71
Exists in master and in 94 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, 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, amdadev_test, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Fix resampling

Showing 1 changed file with 12 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/InternLib/Resampling.hh
  Diff comments   View file @a40aa27
... ... @@ -271,6 +271,7 @@ public:
271 271 }
272 272 }
273 273 if (pParamDataIndexInfo._timeIntToProcessChanged || pParamDataIndexInfo._noMoreTimeInt) {
  274 +std::cout << "BRE - TERMINATED" << std::endl;
274 275 terminated();
275 276 }
276 277 }
... ... @@ -279,19 +280,26 @@ public:
279 280 * @brief compute and write last value, right effect
280 281 */
281 282 virtual void terminated() {
  283 +std::cout << "BRE - A" << std::endl;
282 284 if (_markerPtr->isFinished()) {
  285 +std::cout << "BRE - B" << std::endl;
283 286 return;
284 287 }
285 288 switch (_samplingMode)
286 289 {
287 290 case AVERAGE :
288   - if (!_mem.empty())
289   - {
290   - _val = average(_mem,_paramInput.getDim1(),_paramInput.getDim2());
  291 +std::cout << "BRE - C" << std::endl;
  292 + do {
  293 + if (!_mem.empty()) {
  294 + _val = average(_mem,_paramInput.getDim1(),_paramInput.getDim2());
  295 + }
  296 + else {
  297 + _val << NotANumber();
  298 + }
291 299 _paramOutput->push(_val);
292 300 _paramDataOutput->pushTime(_markerPtr->getTargetTime());
293 301 _mem.clear();
294   - }
  302 + } while(_markerPtr->nextTarget());
295 303 break;
296 304 case INTERPOLATION :
297 305 case NEARESTVALUE :
... ...