CDPP / AMDA_Kernel

Commit e9782682eff952521501fe7de82a6d60434c3b67

Authored by Benjamin Renard
1 parent d8db8efb
Exists in master and in 96 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, akka-scatter-multi-xparams, 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 bug with error bar and resampling (#4716)

Showing 3 changed files with 7 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
  Diff comments   View file @e978268
... ... @@ -2677,9 +2677,11 @@ void PanelPlotOutput::createParameters(std::list<std::string>& usedParametersId_
2677 2677 }
2678 2678  
2679 2679 // Build expression for computed parameter = usedParam - minParam
  2680 + AMDA::Parameters::ParameterSPtr originalMinParam = _parameterManager.getParameter(errorBarProp.getErrorMinMax()->getOriginalParamMin());
  2681 + AMDA::Parameters::ParameterSPtr minParam = createSampledParameterUnderReferenceParameter(originalMinParam, usedParam);
2680 2682 std::stringstream minExpr;
2681 2683 minExpr << "$" << usedParam->getId() << usedParamIndex.str()
2682   - << "-$" + errorBarProp.getErrorMinMax()->getOriginalParamMin() << minParamIndex.str();
  2684 + << "-$" + minParam->getId() << minParamIndex.str();
2683 2685  
2684 2686 //create parameter from expression
2685 2687 AMDA::Parameters::ParameterSPtr usedMinParam = _parameterManager.getParameterFromExpression(minExpr.str(), originalParam->getGapThreshold());
... ... @@ -2695,9 +2697,12 @@ void PanelPlotOutput::createParameters(std::list&lt;std::string&gt;&amp; usedParametersId_
2695 2697 errorBarProp.getErrorMinMax()->setUsedParamMin(usedMinParam->getId());
2696 2698  
2697 2699 // Build expression for computed parameter = usedParam + maxParam
  2700 + AMDA::Parameters::ParameterSPtr originalMaxParam = _parameterManager.getParameter(errorBarProp.getErrorMinMax()->getOriginalParamMax());
  2701 +
  2702 + AMDA::Parameters::ParameterSPtr maxParam = createSampledParameterUnderReferenceParameter(originalMaxParam, usedParam);
2698 2703 std::stringstream maxExpr;
2699 2704 maxExpr << "$" << usedParam->getId() << usedParamIndex.str()
2700   - << "+$" + errorBarProp.getErrorMinMax()->getOriginalParamMax() << maxParamIndex.str();
  2705 + << "+$" + maxParam->getId() << maxParamIndex.str();
2701 2706  
2702 2707 //create parameter from expression
2703 2708 AMDA::Parameters::ParameterSPtr usedMaxParam = _parameterManager.getParameterFromExpression(maxExpr.str(), originalParam->getGapThreshold());
... ...
test/FitNesseRoot/ReleaseS/ThirdPart/ReLease3/SprinT2/UserStory13/errorbar_13_02_REF.png
View file @e978268

147 KB | W: | H:

156 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
test/FitNesseRoot/ReleaseS/ThirdPart/ReLease3/SprinT2/UserStory13/errorbar_13_03_REF.png
View file @e978268

371 KB | W: | H:

377 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin