From 9b2c272ac62cd2ec88fe7348f5f646ee9465d1e4 Mon Sep 17 00:00:00 2001 From: sunwen Date: Tue, 13 Jun 2023 16:56:30 +0800 Subject: [PATCH] Fix tansmission parameters to reflect parameters. --- src/common/dataBlockCreation/getAScanBlockPreprocessed.cpp | 2 +- src/reflectionReconstruction/dataFilter.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/dataBlockCreation/getAScanBlockPreprocessed.cpp b/src/common/dataBlockCreation/getAScanBlockPreprocessed.cpp index db23574..4f37937 100644 --- a/src/common/dataBlockCreation/getAScanBlockPreprocessed.cpp +++ b/src/common/dataBlockCreation/getAScanBlockPreprocessed.cpp @@ -38,7 +38,7 @@ AscanBlockPreprocessed Recon::getAscanBlockPreprocessed(Parser* aParser, const A } else { - usedData = filterReflectionData(geometryBlock.receiverPositionBlock, geometryBlock.senderPositionBlock, geometryBlock.senderNormalBlock, transParams::constrictReflectionAngles); + usedData = filterReflectionData(geometryBlock.receiverPositionBlock, geometryBlock.senderPositionBlock, geometryBlock.senderNormalBlock, reflectParams::constrictReflectionAngles); } ascanBlock.ascanBlock = removeDataFromArrays(ascanBlock.ascanBlock, usedData); diff --git a/src/reflectionReconstruction/dataFilter.cpp b/src/reflectionReconstruction/dataFilter.cpp index 0e17646..9762df4 100644 --- a/src/reflectionReconstruction/dataFilter.cpp +++ b/src/reflectionReconstruction/dataFilter.cpp @@ -17,8 +17,8 @@ Matrix filterReflectionData(const Matrix &aVReceiverPositionBlock, auto positionDifs = aVReceiverPositionBlock - aVSenderPositionBlock; auto inbetweenAngle = acos(dot(aVSenderNormalBlock, positionDifs) / vecnorm(positionDifs, Norm2, 1)); - auto flags = Aurora::auroraNot((inbetweenAngle < (PI * transParams::angleLowerLimit / 180)) + - (inbetweenAngle > (PI * transParams::angleUpperLimit / 180))); + auto flags = Aurora::auroraNot((inbetweenAngle < (PI * reflectParams::angleLowerLimit / 180)) + + (inbetweenAngle > (PI * reflectParams::angleUpperLimit / 180))); reflectData = reflectData * flags; } return reflectData;