diff --git a/src/MATLAB/phantomSSF/genPhantomFigure.m b/src/MATLAB/phantomSSF/genPhantomFigure.m index ea0201e01cf5455301bfa89e7d1ac1f643cdd708..4f8b8af70a9f23b825e6c775f1efd2660a513401 100644 --- a/src/MATLAB/phantomSSF/genPhantomFigure.m +++ b/src/MATLAB/phantomSSF/genPhantomFigure.m @@ -16,9 +16,7 @@ for i = 1:10 end end -4; - -[cnRefVal,ssfRefVal] = ssfPhantom(0); +[cnRefVal,~,ssfRefVal] = ssfPhantom(0); mc = mean(cnRatios,2); sc = std(cnRatios,0,2); diff --git a/src/MATLAB/phantomVelocitySSF/createPhantom.m b/src/MATLAB/phantomVelocitySSF/createPhantom.m index 7cae33e540e0677fc48d929bfa96df72c58c65fa..1290163c79957abdb2a2d781e41de08e2013f485 100644 --- a/src/MATLAB/phantomVelocitySSF/createPhantom.m +++ b/src/MATLAB/phantomVelocitySSF/createPhantom.m @@ -1,4 +1,4 @@ -function phantomVelcocityOutput = createPhantom(phSize,phTracks,phVel_mu,phVel_sigma) +function phantomVelocityImage = createPhantom(phSize,phTracks,phVel_mu,phVel_sigma) tmp = zeros(phSize,'uint8'); @@ -39,6 +39,6 @@ for i = 1:length(trackSrcPts) end -phantomVelcocityOutput = tmp; +phantomVelocityImage = tmp; end \ No newline at end of file diff --git a/src/MATLAB/phantomVelocitySSF/createSyntheticDataset.m b/src/MATLAB/phantomVelocitySSF/createSyntheticDataset.m index c046c8047846244a1b33be638ca191216a7ac900..f8742efc99b5353519e31d2c2b2409253246250b 100644 --- a/src/MATLAB/phantomVelocitySSF/createSyntheticDataset.m +++ b/src/MATLAB/phantomVelocitySSF/createSyntheticDataset.m @@ -19,7 +19,7 @@ for i = 1:length(datasetParameters.phantomVelocity_mu) tmp.phantomSize = phSize; tmp.numTracks = phTracks; tmp.phantomVelocity = [phVel_mu;phVel_sigma]; - tmp.phantomVelocityOutput = createPhantom(phSize,phTracks,phVel_mu,phVel_sigma); + tmp.phantomVelocityImage = createPhantom(phSize,phTracks,phVel_mu,phVel_sigma); syntheticDataset = [syntheticDataset;tmp]; diff --git a/src/MATLAB/phantomVelocitySSF/genPhantomVelocityFigure.m b/src/MATLAB/phantomVelocitySSF/genPhantomVelocityFigure.m index 7d7c97217fd10564ce6306f4590aea17d642a99c..43dae5a790cc607d7beb84c347c48259f58cbe11 100644 --- a/src/MATLAB/phantomVelocitySSF/genPhantomVelocityFigure.m +++ b/src/MATLAB/phantomVelocitySSF/genPhantomVelocityFigure.m @@ -2,9 +2,9 @@ load('sampleDataset_01.mat'); K = 3; -tmp_xy(:,:,1) = squeeze(max(syntheticDataset(1).phantomVelocityOutput(:,:,:,1),[],2)); -tmp_xy(:,:,2) = squeeze(max(syntheticDataset(11).phantomVelocityOutput(:,:,:,1),[],2)); -tmp_xy(:,:,3) = squeeze(max(syntheticDataset(21).phantomVelocityOutput(:,:,:,1),[],2)); +tmp_xy(:,:,1) = squeeze(max(syntheticDataset(1).phantomVelocityImage(:,:,:,1),[],2)); +tmp_xy(:,:,2) = squeeze(max(syntheticDataset(11).phantomVelocityImage(:,:,:,1),[],2)); +tmp_xy(:,:,3) = squeeze(max(syntheticDataset(21).phantomVelocityImage(:,:,:,1),[],2)); figure('Position',[300,200,900,300]); layout1 = tiledlayout(1,3,'TileSpacing','compact','Padding','tight'); diff --git a/src/MATLAB/phantomVelocitySSF/getPhantomClipLimits.m b/src/MATLAB/phantomVelocitySSF/getPhantomClipLimits.m index e25d3c2293c0add2acffb4f4d5a615ec535b9685..24ec3f21f6458c4fefd5c0bf00e6d29f7de60f20 100644 --- a/src/MATLAB/phantomVelocitySSF/getPhantomClipLimits.m +++ b/src/MATLAB/phantomVelocitySSF/getPhantomClipLimits.m @@ -1,7 +1,7 @@ function clipLimits = getPhantomClipLimits(syntheticDataset,targetChannel) for ff = 1:length(syntheticDataset) - im_ff = syntheticDataset(ff).phantomVelocityOutput(:,:,:,targetChannel); + im_ff = syntheticDataset(ff).phantomVelocityImage(:,:,:,targetChannel); kp = im_ff(find(im_ff)); diff --git a/src/MATLAB/phantomVelocitySSF/goSyntheticDataset.m b/src/MATLAB/phantomVelocitySSF/goSyntheticDataset.m index c70cae0e41ca63f3b39806f00bcc9cdd86fe7e07..ff4d7e2928a6dbc5c4ded09412f07bd304812352 100644 --- a/src/MATLAB/phantomVelocitySSF/goSyntheticDataset.m +++ b/src/MATLAB/phantomVelocitySSF/goSyntheticDataset.m @@ -10,7 +10,7 @@ synthDatasetParameters.numOutput = 50; syntheticDataset = createSyntheticDataset(synthDatasetParameters); -syntheticDatasetVel_d = goSyntheticSSF(syntheticDataset,1); -syntheticDatasetRVal_d = goSyntheticSSF(syntheticDataset,2); +syntheticDatasetVel_d = goSyntheticNCD(syntheticDataset,1); +syntheticDatasetRVal_d = goSyntheticNCD(syntheticDataset,2); save('syntheticDataset_01.mat','-v7.3'); \ No newline at end of file diff --git a/src/MATLAB/phantomVelocitySSF/goSyntheticSSF.m b/src/MATLAB/phantomVelocitySSF/goSyntheticNCD.m similarity index 80% rename from src/MATLAB/phantomVelocitySSF/goSyntheticSSF.m rename to src/MATLAB/phantomVelocitySSF/goSyntheticNCD.m index 44e11320f35b9ba6edf7da9441026a2a90a599dc..e8b8a0d83de700ac13b2f87c63cfa6cb8516e610 100644 --- a/src/MATLAB/phantomVelocitySSF/goSyntheticSSF.m +++ b/src/MATLAB/phantomVelocitySSF/goSyntheticNCD.m @@ -1,4 +1,4 @@ -function d = goSyntheticSSF(syntheticDataset,targetChannel) +function d = goSyntheticNCD(syntheticDataset,targetChannel) tStart = tic(); @@ -21,14 +21,14 @@ parfor i=1:H continue end - im_ff = syntheticDataset(ff).phantomVelocityOutput(:,:,:,targetChannel); + im_ff = syntheticDataset(ff).phantomVelocityImage(:,:,:,targetChannel); if ff == gg d1 = SSF.ncd_ssf_volume(im_ff,im_ff); dxx(i,j) = d1; else - im_ff = syntheticDataset(ff).phantomVelocityOutput(:,:,:,targetChannel); - im_gg = syntheticDataset(gg).phantomVelocityOutput(:,:,:,targetChannel); + im_ff = syntheticDataset(ff).phantomVelocityImage(:,:,:,targetChannel); + im_gg = syntheticDataset(gg).phantomVelocityImage(:,:,:,targetChannel); d1 = SSF.ncd_ssf_volume(im_ff,im_gg); d2 = SSF.ncd_ssf_volume(im_gg,im_ff); diff --git a/src/MATLAB/phantomVelocitySSF/sampleDataset_01.mat b/src/MATLAB/phantomVelocitySSF/sampleDataset_01.mat index dc323f70de73c87cbe64e37c966e4f11078bca64..53b9e94a6370315fd2d9786f0704c924821f9d25 100644 Binary files a/src/MATLAB/phantomVelocitySSF/sampleDataset_01.mat and b/src/MATLAB/phantomVelocitySSF/sampleDataset_01.mat differ