diff --git a/src/common/getMeasurementMetaData.cpp b/src/common/getMeasurementMetaData.cpp index 9abc8aa..d4c4f12 100644 --- a/src/common/getMeasurementMetaData.cpp +++ b/src/common/getMeasurementMetaData.cpp @@ -301,7 +301,7 @@ CEInfo Recon::getCEInfo(Parser* aParser, const MeasurementInfo aInfo) } result.ce = ce; result.ceOffSet = aParser->getCEData().getCEOffset(); - result.ce_sf = aInfo.sampleRate; + result.ce_sf = aParser->getCEData().getCE_SF(); if (aInfo.Hardware == "USCT3dv3") { size_t size = aParser->getMetaData().getTasIndices().getLength(); diff --git a/src/transmissionReconstruction/detection/getTransmissionData.cpp b/src/transmissionReconstruction/detection/getTransmissionData.cpp index 34705cd..28c42cf 100644 --- a/src/transmissionReconstruction/detection/getTransmissionData.cpp +++ b/src/transmissionReconstruction/detection/getTransmissionData.cpp @@ -37,6 +37,12 @@ namespace Matrix receiverBlock; Matrix waterTempBlock; MetaInfos metaInfos; + + Matrix ascanBlock; + Matrix ascanBlockRef; + Matrix dists; + Matrix distRefBlock; + Matrix waterTempRefBlock; }; Matrix prepareAScansForTransmissionDetection(const Matrix& aAscanBlock, const Matrix& aGainBlock) @@ -168,13 +174,20 @@ namespace result.senderBlock = blockData.senderPositionBlock; result.receiverBlock = blockData.receiverPositionBlock; result.waterTempBlock = waterTempBlock; + + result.ascanBlock = ascanBlock; + result.ascanBlockRef = ascanBlockRef; + result.dists = dists; + result.distRefBlock = distRefBlock; + result.waterTempRefBlock = waterTempRefBlock; - DetectResult detect = transmissionDetection(ascanBlock, ascanBlockRef, dists, distRefBlock, waterTempBlock, waterTempRefBlock, aExpectedSOSWater[0]); - result.attData = detect.att; - result.tofData = detect.tof; + // DetectResult detect = transmissionDetection(ascanBlock, ascanBlockRef, dists, distRefBlock, waterTempBlock, waterTempRefBlock, aExpectedSOSWater[0]); + // result.attData = detect.att; + // result.tofData = detect.tof; return result; } + } TransmissionData Recon::getTransmissionData(const Aurora::Matrix& aMotorPos, const Aurora::Matrix& aMotoPosRef, const Aurora::Matrix& aSlList, @@ -228,20 +241,54 @@ TransmissionData Recon::getTransmissionData(const Aurora::Matrix& aMotorPos, con rnBlockTotal = zeros(1,numScans,1); } + size_t vectorSize = aMotorPos.getDataSize() * (aSlList.getDataSize() / transParams::senderTASSize) * (aSnList.getDataSize() / transParams::senderElementSize); + std::vector blockOfTransmissionDatas(vectorSize); + int numData = 0; int numPossibleScans = 0; + for(int i=0; i