CDPP / AMDA_Kernel

Commit 65aa1ad5079e4daa057e9498b422e028b9fc3927

Authored by Benjamin Renard
1 parent e8dd349c
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

Fix a bug in resampling by using nearest value

Showing 3 changed files with 7 additions and 12 deletions   Show diff stats
Inline Side-by-side
src/InternLib/Resampling.hh
  Diff comments   View file @65aa1ad
@@ -140,10 +140,13 @@ public: @@ -140,10 +140,13 @@ public:
140 140
141 if ((pParamDataIndexInfo._nbDataToProcess > 0)) { 141 if ((pParamDataIndexInfo._nbDataToProcess > 0)) {
142 //init _val with the first data value (to init dimensions) 142 //init _val with the first data value (to init dimensions)
143 - _val = _paramInput.get(pParamDataIndexInfo._startIndex);  
144 - _nearestValue = _paramInput.get(pParamDataIndexInfo._startIndex);  
145 - _val << NotANumber();  
146 - _nearestValue << NotANumber(); 143 + if (pParamDataIndexInfo._startIndex == 0)
  144 + {
  145 + _val = _paramInput.get(pParamDataIndexInfo._startIndex);
  146 + _nearestValue = _paramInput.get(pParamDataIndexInfo._startIndex);
  147 + _val << NotANumber();
  148 + _nearestValue << NotANumber();
  149 + }
147 150
148 switch (_samplingMode) 151 switch (_samplingMode)
149 { 152 {
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
  Diff comments   View file @65aa1ad
@@ -3143,8 +3143,6 @@ bool PanelPlotOutput::getComputedValuesFromSerieAndInterval(double startDate, do @@ -3143,8 +3143,6 @@ bool PanelPlotOutput::getComputedValuesFromSerieAndInterval(double startDate, do
3143 } 3143 }
3144 3144
3145 //get computed data for interval [startDate, stopDate] in relation with the serie y axis 3145 //get computed data for interval [startDate, stopDate] in relation with the serie y axis
3146 - LOG4CXX_ERROR(gLogger, "BRE - min = " << rSeriesProperties.getMin());  
3147 - LOG4CXX_ERROR(gLogger, "BRE - max = " << rSeriesProperties.getMax());  
3148 (*computedValues) = _panel->getAxis(rSeriesProperties.getYAxisId())->getComputedValues( 3146 (*computedValues) = _panel->getAxis(rSeriesProperties.getYAxisId())->getComputedValues(
3149 valuesInterval, 3147 valuesInterval,
3150 nbValues, 3148 nbValues,
src/ParamOutputImpl/Plot/Scatter/XYPlot.cc
  Diff comments   View file @65aa1ad
@@ -711,12 +711,6 @@ void XYPlot::drawSeries(double startDate, double stopDate, int intervalIndex, st @@ -711,12 +711,6 @@ void XYPlot::drawSeries(double startDate, double stopDate, int intervalIndex, st
711 return; 711 return;
712 } 712 }
713 713
714 - LOG4CXX_ERROR(gLogger, "BRE - nbYValues = " << nbYValues);  
715 - for (int i = 0; i < nbYValues; ++i)  
716 - {  
717 - LOG4CXX_ERROR(gLogger, "BRE - Value = " << lYData[i]);  
718 - }  
719 -  
720 double *coloredComputedValues = NULL; 714 double *coloredComputedValues = NULL;
721 double *coloredTimeValues = NULL; 715 double *coloredTimeValues = NULL;
722 //get colored value if needed 716 //get colored value if needed