10000 fix basis pursuit pics when using a sampling pattern by jtamir · Pull Request #285 · mrirecon/bart · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix basis pursuit pics when using a sampling pattern #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 1, 2022
Merged

fix basis pursuit pics when using a sampling pattern #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c34d6af
re-initialize sense op even if no loop flags
jtamir May 31, 2022
ce117c7
re-initialize sense op if Cartesian bpsense is active
jtamir May 31, 2022
ffcd54e
test-pics-bpwavl1: check data consistency error
jtamir Jun 1, 2022
44af647
style
jtamir Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ int main_pics(int argc, char* argv[argc])

// FIXME: re-initialize forward_op and precond_op

if ((NULL == traj_file) && (0u != loop_flags) && !sms) { // FIXME: no basis
if ((NULL == traj_file) && ((0u != loop_flags && !sms) || conf.bpsense)) { // FIXME: no basis

linop_free(forward_op);
forward_op = sense_init(max1_dims, map_flags, maps);
Expand Down
22 changes: 17 additions & 5 deletions tests/pics.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,28 @@ tests/test-pics-poisson-wavl1: poisson squeeze fft fmac ones pics nrmse $(TESTS_
touch $@


tests/test-pics-bpwavl1: scale fft noise fmac ones pics nrmse $(TESTS_OUT)/shepplogan.ra
tests/test-pics-bpwavl1: scale fft noise fmac ones upat squeeze pics saxpy vec nrmse $(TESTS_OUT)/shepplogan.ra
set -e; mkdir $(TESTS_TMP) ; cd $(TESTS_TMP) ;\
$(TOOLDIR)/scale 50 $(TESTS_OUT)/shepplogan.ra shepp.ra ;\
$(TOOLDIR)/fft -u 7 shepp.ra ksp1.ra ;\
$(TOOLDIR)/noise -s 1 -n 1 ksp1.ra ksp2.ra ;\
$(TOOLDIR)/ones 3 128 128 1 o.ra ;\
$(TOOLDIR)/pics -a -P 128 -w1. -RW:3:0:1. -i50 ksp2.ra o.ra reco.ra ;\
$(TOOLDIR)/pics -m -P 128 -w1. -RW:3:0:1. -i50 -u 2 ksp2.ra o.ra reco2.ra ;\
$(TOOLDIR)/nrmse -t 0.08 shepp.ra reco.ra ;\
$(TOOLDIR)/nrmse -t 0.08 shepp.ra reco2.ra ;\
$(TOOLDIR)/upat -Y 128 -Z 128 -y 2 -z 2 pat.ra ;\
$(TOOLDIR)/squeeze pat.ra pat.ra ;\
$(TOOLDIR)/fmac ksp2.ra pat.ra ksp3.ra ;\
$(TOOLDIR)/pics -a -P 64 -w1. -n -RW:3:0:1. -i50 ksp3.ra o.ra reco.ra ;\
$(TOOLDIR)/pics -m -P 64 -w1. -n -RW:3:0:1. -i100 -u .5 ksp3.ra o.ra reco2.ra ;\
$(TOOLDIR)/fft -u 3 reco.ra kreco.ra ;\
$(TOOLDIR)/saxpy -- -1 kreco.ra ksp3.ra ereco.ra ;\
$(TOOLDIR)/fmac ereco.ra pat.ra preco.ra ;\
$(TOOLDIR)/fmac -C -s 3 preco.ra preco.ra e.ra ;\
$(TOOLDIR)/fft -u 3 reco2.ra kreco2.ra ;\
$(TOOLDIR)/saxpy -- -1 kreco2.ra ksp3.ra ereco2.ra ;\
$(TOOLDIR)/fmac ereco2.ra pat.ra preco2.ra ;\
$(TOOLDIR)/fmac -C -s 3 preco2.ra preco2.ra e2.ra ;\
$(TOOLDIR)/vec 4096 f.ra ;\
$(TOOLDIR)/nrmse -t .001 f.ra e.ra ;\
$(TOOLDIR)/nrmse -t .001 f.ra e2.ra ;\
rm *.ra ; cd .. ; rmdir $(TESTS_TMP)
touch $@

Expand Down
0