From 1e58c207f9a835adfc68292e3a85981c9fb1886c Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Wed, 5 Jun 2024 23:56:21 +0200 Subject: [PATCH] PSX_OperationStatsImpl: Fix median calculation for post processing stats It does not make sense to combine /Z with GetRTError(1) as we will never get an RTE. The test was also incorrect, so this is now tested as well (again). Bug introduced in d3a696ef6 (psxStats: Convert avg post processing to stats, 2023-06-16). --- Packages/MIES/MIES_SweepFormula_PSX.ipf | 5 ++--- Packages/tests/Basic/UTF_SweepFormula_PSX.ipf | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Packages/MIES/MIES_SweepFormula_PSX.ipf b/Packages/MIES/MIES_SweepFormula_PSX.ipf index f58a98a087..a4cb602955 100644 --- a/Packages/MIES/MIES_SweepFormula_PSX.ipf +++ b/Packages/MIES/MIES_SweepFormula_PSX.ipf @@ -1343,10 +1343,9 @@ static Function/WAVE PSX_OperationStatsImpl(string graph, string id, WAVE/WAVE r Make/FREE/D results = {V_avg, NaN, V_adev, V_sdev, V_skew, V_kurt} - AssertonAndClearRTError() - StatsQuantiles/Q/Z resultsRawClean; err = GetRTError(1) + StatsQuantiles/Q/Z resultsRawClean - if(!err) + if(!V_Flag) results[1] = V_Median endif diff --git a/Packages/tests/Basic/UTF_SweepFormula_PSX.ipf b/Packages/tests/Basic/UTF_SweepFormula_PSX.ipf index cd28a5375f..930a8e567d 100644 --- a/Packages/tests/Basic/UTF_SweepFormula_PSX.ipf +++ b/Packages/tests/Basic/UTF_SweepFormula_PSX.ipf @@ -1029,7 +1029,7 @@ Function/WAVE StatsTestSpecialCases_GetInput() input[%outOfRange] = "0" JWN_CreatePath(input, "/0") - JWN_SetWaveInWaveNote(input, "/0/results", {10, 0, 0, 0, NaN, NaN}) + JWN_SetWaveInWaveNote(input, "/0/results", {10, NaN, 0, 0, NaN, NaN}) JWN_SetWaveInWaveNote(input, "/0/xValues", ListToTextWave(PSX_STATS_LABELS, ";")) JWN_SetWaveInWaveNote(input, "/0/marker", {PSX_MARKER_REJECT, PSX_MARKER_REJECT, PSX_MARKER_REJECT, \ PSX_MARKER_REJECT, PSX_MARKER_REJECT, PSX_MARKER_REJECT})