CDPP / AMDA_Kernel

Commit 91acc36e3de72f88ec71cb37909d96ce1f9e83e4

Authored by Benjamin Renard
1 parent 197552e8
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 boxcar process (#6479)

Showing 1 changed file with 6 additions and 9 deletions   Show diff stats
Inline Side-by-side
src/ExternLib/Boxcar/Boxcar.hh
  Diff comments   View file @91acc36
... ... @@ -43,16 +43,15 @@ public:
43 43 * @overload Operation::write(ParamDataIndexInfo &pParamDataIndexInfo)
44 44 */
45 45 void write(ParamDataIndexInfo &pParamDataIndexInfo) {
46   - unsigned int index = pParamDataIndexInfo._startIndex;
47 46 //first call
48   - if(_lastTime == 0.0) {
49   - _lastTime = _paramInput.getTime(index);
  47 + if((_lastTime == 0.0) && (pParamDataIndexInfo._nbDataToProcess > 0)) {
  48 + _lastTime = _paramInput.getTime(pParamDataIndexInfo._startIndex);
50 49 //To create a _sum with the good dimention
51   - _sum = _paramInput.getDataList()[index];
  50 + _sum = _paramInput.getDataList()[pParamDataIndexInfo._startIndex];
52 51 _sum << elemNull;
53 52 }
54   - if(pParamDataIndexInfo._nbDataToProcess > 0) {
55   - for (; index< pParamDataIndexInfo._startIndex + pParamDataIndexInfo._nbDataToProcess; index++) {
  53 + for (unsigned int index = pParamDataIndexInfo._startIndex;
  54 + index< pParamDataIndexInfo._startIndex + pParamDataIndexInfo._nbDataToProcess; index++) {
56 55 if(_paramInput.getTime(index) - _lastTime >= _second) {
57 56 pushData();
58 57 _lastTime = _paramInput.getTime(index);
... ... @@ -61,9 +60,7 @@ public:
61 60 _sum =_sum + _paramInput.getDataList()[index];
62 61 _timeMemory.push_back(_paramInput.getTime(index));
63 62 }
64   - }
65   - //pParamDataIndexInfo._nbDataToProcess == 0: end of Data
66   - else {
  63 + if (pParamDataIndexInfo._timeIntToProcessChanged || pParamDataIndexInfo._noMoreTimeInt) {
67 64 pushData();
68 65 }
69 66 }
... ...