CDPP / AMDA_Kernel

Commit c391ab452e69b5827e4cc26ea1763c70c8b6b320

Authored by Benjamin Renard
1 parent ad920fd6
Exists in master and in 100 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, SolarOrbiter, SpeasyGet, add_path, akka-centos7, akka-scatter-multi-xparams, amdadev, amdadev_test, centos7, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, livraison-akka, 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

computedGapSize of a resampled parameter cannot be lower than the sampling time

Showing 1 changed file with 9 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/InternLib/ProcessSamplingClassic.cc
  Diff comments   View file @c391ab4
... ... @@ -53,10 +53,17 @@ TimeStamp ProcessSamplingClassic::init() {
53 53 }
54 54 double threshold = atof((++(_attributList.begin()))->c_str());
55 55  
56   - _parameter.setGapThreshold(threshold * _paramInput->getMinSampling() / sampling);
57   -
  56 + double newThreshold = threshold * _paramInput->getMinSampling() / sampling;
58 57 double computedGapSize = _parameterInput->getParameterManager().getComputedGapSize(threshold, _paramInput->getMinSampling());
59 58  
  59 + if (computedGapSize < sampling) {
  60 + //If computedGapSize < sampling, set computedGapSize to sampling value (else, each interval between data will be considered as a gap)
  61 + newThreshold = 1;
  62 + computedGapSize = sampling;
  63 + }
  64 +
  65 + _parameter.setGapThreshold(newThreshold);
  66 +
60 67 // ProcessSamplingClassic _operation creation
61 68 Resampling::CreateResampling lCreateResampling( *this, _timeIntervalList, sampling, computedGapSize, *_paramInput, _parameterInput->getDataWriterTemplate()->useNearestValue());
62 69 _operation = lCreateResampling.getResampling();
... ...