First update.
This commit is contained in:
@@ -47,13 +47,13 @@ AscanBlock Recon::getAscanBlock(Parser* aParser, const Aurora::Matrix& aMp, cons
|
||||
size_t numScans = aMp.getDataSize() * aSl.getDataSize() * aSn.getDataSize() * aRl.getDataSize() * aRn.getDataSize();
|
||||
//size_t numScansIndex = 0;
|
||||
int ascanBlockSize = numScans * aParser->getMetaData().getSampleNumber();
|
||||
double* ascanBlockData = new double[ascanBlockSize];
|
||||
double* mpBlockData = new double[numScans];
|
||||
double* slBlockData = new double[numScans];
|
||||
double* snBlockData = new double[numScans];
|
||||
double* rlBlockData = new double[numScans];
|
||||
double* rnBlockData = new double[numScans];
|
||||
double* gainBlockData = new double[numScans];
|
||||
float* ascanBlockData = new float[ascanBlockSize];
|
||||
float* mpBlockData = new float[numScans];
|
||||
float* slBlockData = new float[numScans];
|
||||
float* snBlockData = new float[numScans];
|
||||
float* rlBlockData = new float[numScans];
|
||||
float* rnBlockData = new float[numScans];
|
||||
float* gainBlockData = new float[numScans];
|
||||
result.ascanBlock = Matrix::fromRawData(ascanBlockData, aParser->getMetaData().getSampleNumber(), numScans);
|
||||
result.mpBlock = Matrix::fromRawData(mpBlockData, 1, numScans);
|
||||
result.slBlock = Matrix::fromRawData(slBlockData, 1, numScans);
|
||||
@@ -85,7 +85,7 @@ AscanBlock Recon::getAscanBlock(Parser* aParser, const Aurora::Matrix& aMp, cons
|
||||
mpIndex * aRl.getDataSize() * aRn.getDataSize() * aSn.getDataSize() * aSl.getDataSize();
|
||||
MotorPosition mp = aMp[mpIndex] == 1 ? MotorPosition::MotorPosition1 : MotorPosition::MotorPosition2;
|
||||
AScanData ascan = aParser->searchAscanDataFromOneTasAscanDataOfMP(oneTasData, ElementIndex(GeometryIndex(aSn[snIndex])), TasElementIndex(tasIndices.get()[tasElementMapper[mapperIndex]], ElementIndex(GeometryIndex(receiverIndices.get()[tasElementMapper[mapperIndex]]))), mp);
|
||||
double* startPointer = ascanBlockData + numScansIndex * ascan.getAscanDataLength();
|
||||
float* startPointer = ascanBlockData + numScansIndex * ascan.getAscanDataLength();
|
||||
std::copy(ascan.get() ,ascan.get() + ascan.getAscanDataLength(), startPointer);
|
||||
//ascanBlockData += ascan.getAscanDataLength();
|
||||
mpBlockData[numScansIndex] = aMp[mpIndex];
|
||||
|
||||
Reference in New Issue
Block a user