From 354dfd9dc8775258f172a2fc587595167fe3b733 Mon Sep 17 00:00:00 2001 From: sunwen Date: Tue, 27 Jun 2023 09:15:39 +0800 Subject: [PATCH] Add log message. --- .../startReflectionReconstruction.cpp | 9 +++------ .../reconstruction/reconstruction.cpp | 2 +- .../startTransmissionReconstruction.cpp | 3 +++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/reflectionReconstruction/startReflectionReconstruction.cpp b/src/reflectionReconstruction/startReflectionReconstruction.cpp index 0521db0..067280e 100644 --- a/src/reflectionReconstruction/startReflectionReconstruction.cpp +++ b/src/reflectionReconstruction/startReflectionReconstruction.cpp @@ -13,6 +13,7 @@ #include "reflectionReconstruction/reconstructionSAFT/reconstructionSAFT.h" #include "src/reflectionReconstruction/preprocessData/preprocessAScanBlockForReflection.h" #include "config/config.h" +#include "log/log.h" #include "CudaEnvInit.h" @@ -87,14 +88,10 @@ Aurora::Matrix Recon::startReflectionReconstruction( Parser* aParser, int aSAFT_ removeDataFromArrays(blockData.receiverPositionBlock, preprocessData.usedData), removeDataFromArrays(blockData.mpBlock, preprocessData.usedData), aSAFT_mode, aTransRecos, Env); - printf("%d\n",j); - + RECON_INFO("Reflection Reconstructon: " + std::to_string(j)); } } } - MatlabWriter m("/home/sun/Reflect.mat"); - m.write(Env, "reflect"); - - return Aurora::Matrix(); + return Env; } \ No newline at end of file diff --git a/src/transmissionReconstruction/reconstruction/reconstruction.cpp b/src/transmissionReconstruction/reconstruction/reconstruction.cpp index ee4c0ce..0b50631 100644 --- a/src/transmissionReconstruction/reconstruction/reconstruction.cpp +++ b/src/transmissionReconstruction/reconstruction/reconstruction.cpp @@ -191,7 +191,7 @@ namespace Recon { buildMatrixR = buildMatrix(senderList, receiverList, res, dims, bentRecon && (iter!=1), potentialMap); if(!data.isNull() && bentRecon && iter != numIter) { - //与默认配置bentRecon不符,暂不实现 + //与默认配置bentRecon不符,暂不实现todo // % reconstruction // if(iter == 1) // solverOutput = solveParameterIterator(M, b, dims, parameters, 0); % straight ray with all mus and betas diff --git a/src/transmissionReconstruction/startTransmissionReconstruction.cpp b/src/transmissionReconstruction/startTransmissionReconstruction.cpp index 1bc9f48..40ab92a 100644 --- a/src/transmissionReconstruction/startTransmissionReconstruction.cpp +++ b/src/transmissionReconstruction/startTransmissionReconstruction.cpp @@ -1,6 +1,7 @@ #include "startTransmissionReconstruction.h" #include "./detection/getTransmissionData.h" #include "Matrix.h" +#include "log/log.h" #include "common/dataBlockCreation/removeDataFromArrays.h" #include "src/transmissionReconstruction/dataFilter/dataFilter.h" #include "src/transmissionReconstruction/dataPreperation.h" @@ -22,6 +23,7 @@ TransmissionReconstructionResult Recon::startTransmissionReconstruction(const Au GeometryInfo& aGeomRef, const MeasurementInfo& aExpInfo, const MeasurementInfo& aExpInfoRef, const PreComputes& aPreComputes, Parser* aParser, Parser* aParserRef) { + RECON_INFO("Start getTransmissionData."); auto transmissionData = getTransmissionData(aMotorPos, aMotoPosRef, aSlList, aSnList, aRlList, aRnList, aTemp, aTempRef, aGeom, aGeomRef, aExpInfo, aExpInfoRef, aPreComputes, aParser, aParserRef); Matrix dists = Recon::distanceBetweenTwoPoints(transmissionData.senderList, transmissionData.receiverList); @@ -38,6 +40,7 @@ TransmissionReconstructionResult Recon::startTransmissionReconstruction(const Au Matrix attData = removeDataFromArrays(transmissionData.attDataTotal, valid); Matrix senderList = removeDataFromArrays(positionValues.senderCoordList, valid); Matrix reveiverList = removeDataFromArrays(positionValues.receiverCoordList, valid); + RECON_INFO("Start reconstructArt."); auto transmissionReon = reconstructArt(tofData, attData, positionValues.dims, senderList, reveiverList, positionValues.res, aTemp.expectedSOSWater[0]); TransmissionReconstructionResult result;