Add removeDataFromArrays.

Fix dataFilter to use transparams.
This commit is contained in:
sunwen
2023-05-25 16:19:08 +08:00
parent 5bd7a15238
commit 9837c425d1
8 changed files with 84 additions and 21 deletions

View File

@@ -1,4 +1,5 @@
#include "dataFilter.h"
#include "src/config/config.h"
#include <cmath>
#include <cstddef>
@@ -79,18 +80,17 @@ namespace Recon {
return sosValues;
}
Aurora::Matrix filterTransmissionData(int aFilterSensitivity, const Aurora::Matrix &aVslBlock,
Aurora::Matrix filterTransmissionData(const Aurora::Matrix &aVslBlock,
const Aurora::Matrix &aVsnBlock, const Aurora::Matrix &aVrlBlock,
const Aurora::Matrix &aVrnBlock, std::vector<Aurora::Matrix> &aMSensData,
const Aurora::Matrix &aMSenderNormalBlock,
const Aurora::Matrix &aMReceiverNormalBlock,
double* params)
const Aurora::Matrix &aMReceiverNormalBlock)
{
switch (aFilterSensitivity) {
switch (transParams::filterSensitivity) {
case 1:
return filterTransmissionSensitivityMap(params[0], aVslBlock, aVsnBlock, aVrlBlock, aVrnBlock, aMSensData);
return filterTransmissionSensitivityMap(transParams::sensFilter, aVslBlock, aVsnBlock, aVrlBlock, aVrnBlock, aMSensData);
case 2:
return filterTransmissionAngle(params[0], params[1], aMSenderNormalBlock, aMReceiverNormalBlock);
return filterTransmissionAngle(transParams::angleLowerLimit, transParams::angleUpperLimit, aMSenderNormalBlock, aMReceiverNormalBlock);
}
std::cerr<<"FilterSensitivity value error!"<<std::endl;
return Aurora::Matrix();

View File

@@ -25,7 +25,6 @@ Aurora::Matrix checkTofDetections(Aurora::Matrix &aVTofValues,
/**
* filterTransmissionData
*
* @param aFilterSensitivity
* @param aVslBlock
* @param aVsnBlock
* @param aVrlBlock
@@ -33,17 +32,15 @@ Aurora::Matrix checkTofDetections(Aurora::Matrix &aVTofValues,
* @param aMSensData
* @param aMSenderNormalBlock
* @param aMReceiverNormalBlock
* @param params
* 如果aFilterSensitivity为1单个值sensFilter如果为2双值angleLowerLimit,
* angleUpperLimit
* @return Aurora::Matrix
*/
Aurora::Matrix filterTransmissionData(
int aFilterSensitivity, const Aurora::Matrix &aVslBlock,
Aurora::Matrix filterTransmissionData( const Aurora::Matrix &aVslBlock,
const Aurora::Matrix &aVsnBlock, const Aurora::Matrix &aVrlBlock,
const Aurora::Matrix &aVrnBlock, std::vector<Aurora::Matrix> &aMSensData,
const Aurora::Matrix &aMSenderNormalBlock,
const Aurora::Matrix &aMReceiverNormalBlock, double *params);
const Aurora::Matrix &aMReceiverNormalBlock);
Aurora::Matrix findDefectTransmissionData(const Aurora::Matrix &aVSNRList,double aSNRDifference);