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.

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

SAFIR updates #1502

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

SomayehSaghamanesh
Copy link

Changes in this pull request

Added two models of SAFIR scanners (generic geometry) to stir's scanners list.
Added two utilities to convert and trim projections.

Testing performed

STIR-6 build tests were performed successfully without any error. Tests for SAFIR I/II data conversion and image reconstructions were performed successfully.

Related issues

issue #1501

Checklist before requesting a review

  • I have performed a self-review of my code
  • [] I have added docstrings/doxygen in line with the guidance in the developer guide
  • I have implemented unit tests that cover any new or modified functionality (if applicable)
  • The code builds and runs on my machine
  • [] documentation/release_XXX.md has been updated with any functionality change (if applicable)

@KrisThielemans
Copy link
Collaborator

Not sure why the diff is so large after the merge. @robbietuk saw something similar. @casperdcl is there anything going wrong with GitHub ATM?

It would be best to locally rebase your branch on origin/master, and force-push to here, or even create a new PR. sorry

Truncating sinograms can already be done via SSRB. Do we really need another utility?

@SomayehSaghamanesh
Copy link
Author

I haven't tried SSRB for our purposes. Does it work with generic geometries as well?
Can I rebase and then continue in the same PR?

@KrisThielemans
Copy link
Collaborator

I haven't tried SSRB for our purposes. Does it work with generic geometries as well?

it won't work for span, but (could be made to) work for trimming and possibly view-mashing

Can I rebase and then continue in the same PR?

Normally you can, but you will have to force push. Who knows what GitHub will do for the diff now, but worth a try.

@casperdcl
Copy link
Contributor

casperdcl commented Sep 4, 2024

the last commit in this PR (b98ce8a) added a massive build_safir_updates folder which looks like a build output directory to me... Probably just need to delete that commit and try merge again.

@KrisThielemans
Copy link
Collaborator

ok. didn't even see that!

@SomayehSaghamanesh , please remove your build (don't put it in the source dir, or add it to your local .gitignore), rebase, and force-push.

@SomayehSaghamanesh
Copy link
Author

SomayehSaghamanesh commented Sep 4, 2024 via email

@KrisThielemans
Copy link
Collaborator

clearly not. 5000+ files difference...

if you want to drop a commit, easiest is to use interactive rebase I'm afraid.

@SomayehSaghamanesh
Copy link
Author

SomayehSaghamanesh commented Sep 4, 2024 via email

@SomayehSaghamanesh
Copy link
Author

I think the git problem is fixed now.

Copy link
Collaborator

@robbietuk robbietuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple of comments. Trimming projdata conversation turned up in #1499 (comment).

I think the two utilities need to be added to https://github.com/UCL/STIR/blob/master/src/utilities/CMakeLists.txt

Comment on lines +20 to +21
\param num_tang_poss_to_trim has to be smaller than the available number
of tangential positions.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not clear from this documentation which tangential positions are trimmed, min or max tangential positions?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The trim should be symmetric. I can include in the documentation.
Yes, two utilities should be included in the CMakeLists indeed. just ignored to be tracked locally. I'll do it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants