CDPP / AMDA_Kernel

Commit 397d8b8dc854ad5b3c73db9acdd328460f705cbe

Authored by Benjamin Renard
1 parent 9b9e2c69
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 #5393 - Detect fill values in plot

Showing 1 changed file with 13 additions and 9 deletions   Show diff stats
Inline Side-by-side
src/ParamOutputImpl/Plot/PlotOutput.cc
  Diff comments   View file @397d8b8
... ... @@ -99,6 +99,10 @@ void PlotOutput::getDataFromServer()
99 99 throw;
100 100 }
101 101 }
  102 +
  103 + for (std::map<std::string, ParameterData>::iterator it = _parameterValues.begin(); it != _parameterValues.end(); ++it) {
  104 + std::cout << it->first << " - " << it->second.getSize() << std::endl;
  105 + }
102 106 }
103 107  
104 108 /**
... ... @@ -663,7 +667,7 @@ void PlotOutput::visit(
663 667 {
664 668 crtParameterData.addValue(
665 669 pParamData->getTime(index),
666   - pParamData->get(index),
  670 + isNAN(pParamData->get(index)) ? NAN: pParamData->get(index),
667 671 pParamData->getMinSampling(),
668 672 gapDetected, componentIndex);
669 673 }
... ... @@ -690,7 +694,7 @@ void PlotOutput::visit(
690 694 + _paramDataIndexInfo._startIndex; ++index) {
691 695 crtParameterData.addValue(
692 696 pParamData->getTime(index),
693   - pParamData->get(index),
  697 + isNAN(pParamData->get(index)) ? NAN: pParamData->get(index),
694 698 pParamData->getMinSampling(),
695 699 gapDetected, componentIndex);
696 700 }
... ... @@ -717,7 +721,7 @@ void PlotOutput::visit(
717 721 + _paramDataIndexInfo._startIndex; ++index) {
718 722 crtParameterData.addValue(
719 723 pParamData->getTime(index),
720   - pParamData->get(index),
  724 + isNAN(pParamData->get(index)) ? NAN: pParamData->get(index),
721 725 pParamData->getMinSampling(),
722 726 gapDetected, componentIndex);
723 727 }
... ... @@ -813,7 +817,7 @@ void PlotOutput::visit(
813 817 double time = pParamData->getTime(i);
814 818 for (auto& index : crtParameterData._indexes) {
815 819 crtParameterData.addValue(time,
816   - pParamData->get(i)[index.getDim1Index()],
  820 + isNAN(pParamData->get(i)[index.getDim1Index()]) ? NAN: pParamData->get(i)[index.getDim1Index()],
817 821 pParamData->getMinSampling(),
818 822 gapDetected, index);
819 823 }
... ... @@ -845,7 +849,7 @@ void PlotOutput::visit(
845 849 double time = pParamData->getTime(i);
846 850 for (auto& index : crtParameterData._indexes) {
847 851 crtParameterData.addValue(time,
848   - pParamData->get(i)[index.getDim1Index()],
  852 + isNAN(pParamData->get(i)[index.getDim1Index()]) ? NAN: pParamData->get(i)[index.getDim1Index()],
849 853 pParamData->getMinSampling(),
850 854 gapDetected, index);
851 855 }
... ... @@ -877,7 +881,7 @@ void PlotOutput::visit(
877 881 double time = pParamData->getTime(i);
878 882 for (auto& index : crtParameterData._indexes) {
879 883 crtParameterData.addValue(time,
880   - pParamData->get(i)[index.getDim1Index()],
  884 + isNAN(pParamData->get(i)[index.getDim1Index()]) ? NAN: pParamData->get(i)[index.getDim1Index()],
881 885 pParamData->getMinSampling(),
882 886 gapDetected, index);
883 887 }
... ... @@ -977,7 +981,7 @@ void PlotOutput::visit(AMDA::Parameters::ParamDataTab2DFloat *pParamData) {
977 981 double time = pParamData->getTime(i);
978 982 for (auto& index : crtParameterData._indexes) {
979 983 crtParameterData.addValue(time,
980   - pParamData->get(i)[index.getDim1Index()][index.getDim2Index()],
  984 + isNAN(pParamData->get(i)[index.getDim1Index()][index.getDim2Index()]) ? NAN: pParamData->get(i)[index.getDim1Index()][index.getDim2Index()],
981 985 pParamData->getMinSampling(),
982 986 gapDetected, index);
983 987 }
... ... @@ -1008,7 +1012,7 @@ void PlotOutput::visit(AMDA::Parameters::ParamDataTab2DDouble *pParamData) {
1008 1012 double time = pParamData->getTime(i);
1009 1013 for (auto& index : crtParameterData._indexes) {
1010 1014 crtParameterData.addValue(time,
1011   - pParamData->get(i)[index.getDim1Index()][index.getDim2Index()],
  1015 + isNAN(pParamData->get(i)[index.getDim1Index()][index.getDim2Index()]) ? NAN: pParamData->get(i)[index.getDim1Index()][index.getDim2Index()],
1012 1016 pParamData->getMinSampling(),
1013 1017 gapDetected, index);
1014 1018 }
... ... @@ -1039,7 +1043,7 @@ void PlotOutput::visit(AMDA::Parameters::ParamDataTab2DLongDouble *pParamData) {
1039 1043 double time = pParamData->getTime(i);
1040 1044 for (auto& index : crtParameterData._indexes) {
1041 1045 crtParameterData.addValue(time,
1042   - pParamData->get(i)[index.getDim1Index()][index.getDim2Index()],
  1046 + isNAN(pParamData->get(i)[index.getDim1Index()][index.getDim2Index()]) ? NAN: pParamData->get(i)[index.getDim1Index()][index.getDim2Index()],
1043 1047 pParamData->getMinSampling(),
1044 1048 gapDetected, index);
1045 1049 }
... ...