Skip to content
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

Fix SSRB for ACFs in scatter estimation #1531

Merged
merged 10 commits into from
Nov 20, 2024
Merged

Fix SSRB for ACFs in scatter estimation #1531

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bdcec67
Scatter Estimation - boolean for 2d proj data - acfs 3d
rmapree Nov 5, 2024
c1185bd
clang-format changes
rmapree Nov 6, 2024
0015dde
Merge remote-tracking branch 'ucl_repo/master' into scat_est_fix
rmapree Nov 8, 2024
1d080c4
fix white space
rmapree Nov 8, 2024
e7ef0ef
Update release_6.3.htm
rmapree Nov 20, 2024
f58799a
Merge pull request #1 from rmapree/scatter_estimation_documentation
rmapree Nov 20, 2024
d302c36
add link to PR in release notes [ci skip]
KrisThielemans Nov 20, 2024
ee68461
re-fix link to PR in release notes [ci skip]
KrisThielemans Nov 20, 2024
ab3acec
Merge remote-tracking branch 'toni/master' into scat_est_fix
KrisThielemans Nov 20, 2024
108d062
fix white-space etc in release notes
KrisThielemans Nov 20, 2024
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
3 changes: 2 additions & 1 deletion src/include/stir/scatter/ScatterEstimation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ class ScatterEstimation : public ParsingObject

//! make projdata 2D shared pointer
shared_ptr<ProjData> make_2D_projdata_sptr(const shared_ptr<ProjData> in_3d_sptr);
shared_ptr<ProjData> make_2D_projdata_sptr(const shared_ptr<ProjData> in_3d_sptr, string template_filename);
shared_ptr<ProjData>
make_2D_projdata_sptr(const shared_ptr<ProjData> in_3d_sptr, string template_filename, const bool do_normalisation = false);

//!
//! \brief set_up
Expand Down
8 changes: 5 additions & 3 deletions src/scatter_buildblock/ScatterEstimation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@ ScatterEstimation::make_2D_projdata_sptr(const shared_ptr<ProjData> in_3d_sptr)
}

shared_ptr<ProjData>
ScatterEstimation::make_2D_projdata_sptr(const shared_ptr<ProjData> in_3d_sptr, string template_filename)
ScatterEstimation::make_2D_projdata_sptr(const shared_ptr<ProjData> in_3d_sptr,
string template_filename,
const bool do_normalisation)
{
shared_ptr<ProjData> out_2d_sptr;
if (in_3d_sptr->get_proj_data_info_sptr()->get_scanner_sptr()->get_scanner_geometry() == "Cylindrical")
Expand All @@ -198,7 +200,7 @@ ScatterEstimation::make_2D_projdata_sptr(const shared_ptr<ProjData> in_3d_sptr,
this->input_projdata_2d_sptr->get_exam_info_sptr(),
this->input_projdata_2d_sptr->get_proj_data_info_sptr()->create_shared_clone());

SSRB(*out_2d_sptr, *in_3d_sptr, false);
SSRB(*out_2d_sptr, *in_3d_sptr, do_normalisation);
}
else
{
Expand Down Expand Up @@ -658,7 +660,7 @@ ScatterEstimation::set_up_iterative(shared_ptr<IterativeReconstruction<Discretis
info("ScatterEstimation: Running SSRB on attenuation correction coefficients ...");

std::string out_filename = "tmp_atten_sino_2d.hs";
atten_projdata_2d_sptr = make_2D_projdata_sptr(tmp_atten_projdata_sptr, out_filename);
atten_projdata_2d_sptr = make_2D_projdata_sptr(tmp_atten_projdata_sptr, out_filename, true);
}
else
{
Expand Down
Loading