From 5199974fcb7925c6bbda27b59b850301ae6cdfd2 Mon Sep 17 00:00:00 2001
From: kradchen <chenjuijun@realcan.cn>
Date: Mon, 8 May 2023 10:13:17 +0800
Subject: [PATCH] Add ceMatchedFilterHandling to common folder

---
 src/common/ceMatchedFilterHandling.cpp | 21 +++++++++------------
 src/common/ceMatchedFilterHandling.h   |  2 ++
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/common/ceMatchedFilterHandling.cpp b/src/common/ceMatchedFilterHandling.cpp
index 7645ce2..8d71ef4 100644
--- a/src/common/ceMatchedFilterHandling.cpp
+++ b/src/common/ceMatchedFilterHandling.cpp
@@ -44,27 +44,24 @@ Aurora::Matrix Recon::adaptFrequency(Aurora::Matrix &aCE, double ceSampleFrequen
 Aurora::Matrix Recon::preprocessCE(Aurora::Matrix &aCE, double ceSampleFrequency, double requiredFrequency, double expectedLength)
 {
     adaptFrequency(aCE,ceSampleFrequency,requiredFrequency);
-    aCE = aCE - Aurora::mean(aCE);
+    aCE = aCE - Aurora::mean(aCE).getScalar();
     aCE = aCE / Aurora::max(Aurora::abs(aCE)).getScalar(); 
     aCE = aCE / Aurora::sum(Aurora::abs(aCE)).getScalar(); 
+    
+    Aurora::padding(aCE,expectedLength,0.0);
 
-//     % adapt to AScan length
-// ce(expectedLength) = 0; % padding to size of ascan
-
-// if (length(ce) > expectedLength) % cropping to size of ascan
-//     ce(expectedLength+1:end) = [];
-// end
-
-// ce = ce(:);
+    if (expectedLength<aCE.getDataSize()){
+        aCE.forceReshape(expectedLength,1,1);
+    }
     return aCE;
 }
 
 Aurora::Matrix Recon::createMatchedFilter(const Aurora::Matrix &aCE,
                                           bool measuredCEused, bool findDefects,
-                                          bool removeOutliersFromCEMeasured, std::string hardwareVersion)
+                                          bool aRemoveOutliersFromCEMeasured, std::string aHardwareVersion)
 {
     Aurora::Matrix mFTime = Aurora::Matrix::copyFromRawData(aCE.getData(), 4000, 2304);
-    if (removeOutliersFromCEMeasured)
+    if (aRemoveOutliersFromCEMeasured)
     {
         auto normSTD = Aurora::std(Aurora::abs(mFTime));
         Aurora::nantoval(normSTD, 0.0);
@@ -114,7 +111,7 @@ Aurora::Matrix Recon::createMatchedFilter(const Aurora::Matrix &aCE,
 
     if (measuredCEused)
     {
-        auto mFTime2 = Aurora::real(Aurora::ifft(hardwareVersion == "USCT3Dv3" ? -matchedFilter : matchedFilter));
+        auto mFTime2 = Aurora::real(Aurora::ifft(aHardwareVersion == "USCT3Dv3" ? -matchedFilter : matchedFilter));
         mFTime2 = mFTime2 / Aurora::repmat(Aurora::max(Aurora::abs(mFTime2)), mFTime2.getDimSize(0), 1);
         mFTime2 = mFTime2 / Aurora::repmat(Aurora::sum(Aurora::abs(mFTime2)), mFTime2.getDimSize(0), 1);
         matchedFilter = Aurora::fft(mFTime2);
diff --git a/src/common/ceMatchedFilterHandling.h b/src/common/ceMatchedFilterHandling.h
index 63d7c6c..95c8ee9 100644
--- a/src/common/ceMatchedFilterHandling.h
+++ b/src/common/ceMatchedFilterHandling.h
@@ -3,7 +3,9 @@
 #include "Matrix.h"
 namespace Recon
 {
+
     Aurora::Matrix adaptFrequency(Aurora::Matrix &aCE,double ceSampleFrequency, double requiredFrequency);
+    // Aurora::Matrix preprocessMeasuredCE(Aurora::Matrix &aCEMeasured,int aBandpassundersampling,int aNumberSamples);
     Aurora::Matrix preprocessCE(Aurora::Matrix &aCE,double ceSampleFrequency, double requiredFrequency, double expectedLength);
     Aurora::Matrix createMatchedFilter(const Aurora::Matrix &aCE,
         bool measuredCEused, bool findDefects, bool removeOutliersFromCEMeasured, std::string hardwareVersion);