commit dev-sun.
This commit is contained in:
@@ -96,7 +96,7 @@ int Recon::startReconstructions(const std::string& aDataPath, const std::string&
|
||||
TempInfo tempRef;
|
||||
CEInfo ceRef;
|
||||
Matrix transformationMatricesRef;
|
||||
Recon::notifyProgress(1);
|
||||
//Recon::notifyProgress(1);
|
||||
if(transParams::runTransmissionReco)
|
||||
{
|
||||
expInfoRef = loadMeasurementInfos(&refParser);
|
||||
@@ -129,7 +129,7 @@ int Recon::startReconstructions(const std::string& aDataPath, const std::string&
|
||||
transformationMatricesRef = Matrix();
|
||||
motorPosAvailableRef = Matrix();
|
||||
}
|
||||
Recon::notifyProgress(2);
|
||||
//Recon::notifyProgress(2);
|
||||
if(!ce.ce.isNull() && !ceRef.ce.isNull())
|
||||
{
|
||||
Matrix isEqual = (ce.ce == ceRef.ce);
|
||||
@@ -156,12 +156,12 @@ int Recon::startReconstructions(const std::string& aDataPath, const std::string&
|
||||
preComputes.matchedFilter = createMatchedFilter(ce.ceRef, ce.measuredCEUsed, reflectParams::findDefects, reconParams::removeOutliersFromCEMeasured, expInfo.Hardware);
|
||||
}
|
||||
}
|
||||
Recon::notifyProgress(3);
|
||||
//Recon::notifyProgress(3);
|
||||
if(expInfo.sampleRate != reflectParams::aScanReconstructionFrequency)
|
||||
{
|
||||
reflectParams::expectedAScanDataLength = ceil(expInfo.numberSamples * ((float)reflectParams::aScanReconstructionFrequency / expInfo.sampleRate));
|
||||
}
|
||||
Recon::notifyProgress(4);
|
||||
//Recon::notifyProgress(4);
|
||||
TransmissionReconstructionResult transmissionResult;
|
||||
bool sosAvailable = false;
|
||||
bool attAvailable = false;
|
||||
@@ -220,7 +220,7 @@ int Recon::startReconstructions(const std::string& aDataPath, const std::string&
|
||||
|
||||
GeometryInfo geomRef = getGeometryInfo(motorPosAvailableRef, transformationMatricesRef, rlList, rnList, slList, snList);
|
||||
RECON_INFO("Start transmissionRecostruction.");
|
||||
Recon::notifyProgress(5);
|
||||
//Recon::notifyProgress(5);
|
||||
transmissionResult = startTransmissionReconstruction(mp_inter, mpRef_inter, slList_inter, snList_inter, rlList_inter, rnList_inter, temp, tempRef, geom, geomRef, expInfo, expInfoRef, preComputes, &dataParser, &refParser);
|
||||
attAvailable = true;
|
||||
sosAvailable = true;
|
||||
@@ -235,11 +235,11 @@ int Recon::startReconstructions(const std::string& aDataPath, const std::string&
|
||||
Matrix recoSOS = transmissionResult.recoSOS;
|
||||
Matrix recoATT = transmissionResult.recoATT;
|
||||
precalcImageParameters(geom);
|
||||
Recon::notifyProgress(21);
|
||||
//Recon::notifyProgress(21);
|
||||
//检测可使用内存是否足够,输出警报用,todo
|
||||
//checkEnvAndMemory(reflectParams.imageInfos.IMAGE_XYZ);
|
||||
auto preProcessData = preprocessTransmissionReconstructionForReflection(recoSOS, recoATT, transmissionResult.ddmis, geom, temp);
|
||||
Recon::notifyProgress(22);
|
||||
//Recon::notifyProgress(22);
|
||||
Matrix mp_inter = intersect(motorPosAvailable, reflectParams::motorPos);
|
||||
Matrix slList_inter = intersect(slList, reflectParams::senderTasList);
|
||||
Matrix snList_inter = intersect(snList, reflectParams::senderElementList);
|
||||
@@ -252,12 +252,12 @@ int Recon::startReconstructions(const std::string& aDataPath, const std::string&
|
||||
preComputes.offset = estimateOffset(expInfo, ce, preComputes.matchedFilter);
|
||||
|
||||
reflectParams::gpuSelectionList = reconParams::gpuSelectionList;
|
||||
Recon::notifyProgress(25);
|
||||
//Recon::notifyProgress(25);
|
||||
RECON_INFO("Start reflectionRecostruction.");
|
||||
Matrix env = startReflectionReconstruction(&dataParser, preProcessData.saftMode, mp_inter, slList_inter, snList_inter, rlList_inter, rnList_inter, geom, preProcessData.transRecos, expInfo, preComputes);
|
||||
writer.setMatrix(env, "reflect");
|
||||
//exporter.exportDICOM(env, Recon::DICOMExporter::REFL);
|
||||
Recon::notifyProgress(99);
|
||||
//Recon::notifyProgress(99);
|
||||
}
|
||||
writer.write();
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user