From ba061af8b25d7dff7d9c35b0e96d2fd47fa24bac Mon Sep 17 00:00:00 2001 From: Caterina Toscano Date: Fri, 13 Dec 2024 12:58:37 +0100 Subject: [PATCH] elevation check in multiple detrending --- interpolation/interpolation.cpp | 4 ++-- project/project.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interpolation/interpolation.cpp b/interpolation/interpolation.cpp index bbed1f73..1ed4a955 100644 --- a/interpolation/interpolation.cpp +++ b/interpolation/interpolation.cpp @@ -1769,7 +1769,7 @@ bool multipleDetrendingMain(std::vector &myPoints if (!multipleDetrendingElevationFitting(elevationPos, myPoints, mySettings, myVar, errorStr, true)) return false; - detrendingElevation(elevationPos, myPoints, mySettings); + if (mySettings->getCurrentCombination().isProxySignificant(elevationPos)) detrendingElevation(elevationPos, myPoints, mySettings); } if (!multipleDetrendingOtherProxiesFitting(elevationPos, myPoints, mySettings, myVar, errorStr)) @@ -2159,7 +2159,7 @@ bool glocalDetrendingFitting(std::vector &myPoint if (elevationPos != NODATA && mySettings->getSelectedCombination().isProxyActive(elevationPos)) { if (!multipleDetrendingElevationFitting(elevationPos, subsetPoints, mySettings, myVar, errorStr, false)) return false; - detrendingElevation(elevationPos, subsetPoints, mySettings); + if (mySettings->getCurrentCombination().isProxySignificant(elevationPos)) detrendingElevation(elevationPos, subsetPoints, mySettings); } if (!multipleDetrendingOtherProxiesFitting(elevationPos, subsetPoints, mySettings, myVar, errorStr)) return false; diff --git a/project/project.cpp b/project/project.cpp index 784804ad..fdbb823f 100644 --- a/project/project.cpp +++ b/project/project.cpp @@ -3488,7 +3488,7 @@ void Project::macroAreaDetrending(Crit3DMacroArea myArea, meteoVariable myVar, s } //detrending - if (elevationPos != NODATA && myArea.getCombination().isProxyActive(elevationPos)) + if (elevationPos != NODATA && myArea.getCombination().isProxyActive(elevationPos) && myArea.getCombination().isProxySignificant(elevationPos)) { detrendingElevation(elevationPos, subsetInterpolationPoints, &interpolationSettings); }