Add log message.

This commit is contained in:
sunwen
2023-06-27 09:15:39 +08:00
parent e28305bef6
commit 354dfd9dc8
3 changed files with 7 additions and 7 deletions

View File

@@ -13,6 +13,7 @@
#include "reflectionReconstruction/reconstructionSAFT/reconstructionSAFT.h" #include "reflectionReconstruction/reconstructionSAFT/reconstructionSAFT.h"
#include "src/reflectionReconstruction/preprocessData/preprocessAScanBlockForReflection.h" #include "src/reflectionReconstruction/preprocessData/preprocessAScanBlockForReflection.h"
#include "config/config.h" #include "config/config.h"
#include "log/log.h"
#include "CudaEnvInit.h" #include "CudaEnvInit.h"
@@ -87,14 +88,10 @@ Aurora::Matrix Recon::startReflectionReconstruction( Parser* aParser, int aSAFT_
removeDataFromArrays(blockData.receiverPositionBlock, preprocessData.usedData), removeDataFromArrays(blockData.receiverPositionBlock, preprocessData.usedData),
removeDataFromArrays(blockData.mpBlock, preprocessData.usedData), removeDataFromArrays(blockData.mpBlock, preprocessData.usedData),
aSAFT_mode, aTransRecos, Env); aSAFT_mode, aTransRecos, Env);
printf("%d\n",j); RECON_INFO("Reflection Reconstructon: " + std::to_string(j));
} }
} }
} }
MatlabWriter m("/home/sun/Reflect.mat"); return Env;
m.write(Env, "reflect");
return Aurora::Matrix();
} }

View File

@@ -191,7 +191,7 @@ namespace Recon {
buildMatrixR = buildMatrix(senderList, receiverList, res, dims, bentRecon && (iter!=1), potentialMap); buildMatrixR = buildMatrix(senderList, receiverList, res, dims, bentRecon && (iter!=1), potentialMap);
if(!data.isNull() && bentRecon && iter != numIter) if(!data.isNull() && bentRecon && iter != numIter)
{ {
//与默认配置bentRecon不符暂不实现 //与默认配置bentRecon不符暂不实现todo
// % reconstruction // % reconstruction
// if(iter == 1) // if(iter == 1)
// solverOutput = solveParameterIterator(M, b, dims, parameters, 0); % straight ray with all mus and betas // solverOutput = solveParameterIterator(M, b, dims, parameters, 0); % straight ray with all mus and betas

View File

@@ -1,6 +1,7 @@
#include "startTransmissionReconstruction.h" #include "startTransmissionReconstruction.h"
#include "./detection/getTransmissionData.h" #include "./detection/getTransmissionData.h"
#include "Matrix.h" #include "Matrix.h"
#include "log/log.h"
#include "common/dataBlockCreation/removeDataFromArrays.h" #include "common/dataBlockCreation/removeDataFromArrays.h"
#include "src/transmissionReconstruction/dataFilter/dataFilter.h" #include "src/transmissionReconstruction/dataFilter/dataFilter.h"
#include "src/transmissionReconstruction/dataPreperation.h" #include "src/transmissionReconstruction/dataPreperation.h"
@@ -22,6 +23,7 @@ TransmissionReconstructionResult Recon::startTransmissionReconstruction(const Au
GeometryInfo& aGeomRef, const MeasurementInfo& aExpInfo, const MeasurementInfo& aExpInfoRef, GeometryInfo& aGeomRef, const MeasurementInfo& aExpInfo, const MeasurementInfo& aExpInfoRef,
const PreComputes& aPreComputes, Parser* aParser, Parser* aParserRef) const PreComputes& aPreComputes, Parser* aParser, Parser* aParserRef)
{ {
RECON_INFO("Start getTransmissionData.");
auto transmissionData = getTransmissionData(aMotorPos, aMotoPosRef, aSlList, aSnList, aRlList, aRnList, aTemp, aTempRef, auto transmissionData = getTransmissionData(aMotorPos, aMotoPosRef, aSlList, aSnList, aRlList, aRnList, aTemp, aTempRef,
aGeom, aGeomRef, aExpInfo, aExpInfoRef, aPreComputes, aParser, aParserRef); aGeom, aGeomRef, aExpInfo, aExpInfoRef, aPreComputes, aParser, aParserRef);
Matrix dists = Recon::distanceBetweenTwoPoints(transmissionData.senderList, transmissionData.receiverList); Matrix dists = Recon::distanceBetweenTwoPoints(transmissionData.senderList, transmissionData.receiverList);
@@ -38,6 +40,7 @@ TransmissionReconstructionResult Recon::startTransmissionReconstruction(const Au
Matrix attData = removeDataFromArrays(transmissionData.attDataTotal, valid); Matrix attData = removeDataFromArrays(transmissionData.attDataTotal, valid);
Matrix senderList = removeDataFromArrays(positionValues.senderCoordList, valid); Matrix senderList = removeDataFromArrays(positionValues.senderCoordList, valid);
Matrix reveiverList = removeDataFromArrays(positionValues.receiverCoordList, 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]); auto transmissionReon = reconstructArt(tofData, attData, positionValues.dims, senderList, reveiverList, positionValues.res, aTemp.expectedSOSWater[0]);
TransmissionReconstructionResult result; TransmissionReconstructionResult result;