Skip to content

SAFIR updates#1502

Closed
SomayehSaghamanesh wants to merge 29 commits into
UCL:masterfrom
SomayehSaghamanesh:safir_updates
Closed

SAFIR updates#1502
SomayehSaghamanesh wants to merge 29 commits into
UCL:masterfrom
SomayehSaghamanesh:safir_updates

Conversation

@SomayehSaghamanesh

Copy link
Copy Markdown

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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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

casperdcl commented Sep 4, 2024

Copy link
Copy Markdown
Collaborator

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
Copy Markdown
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

SomayehSaghamanesh commented Sep 4, 2024 via email

Copy link
Copy Markdown
Author

@KrisThielemans

Copy link
Copy Markdown
Collaborator

clearly not. 5000+ files difference...

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

@SomayehSaghamanesh

SomayehSaghamanesh commented Sep 4, 2024 via email

Copy link
Copy Markdown
Author

@SomayehSaghamanesh

Copy link
Copy Markdown
Author

I think the git problem is fixed now.

@robbietuk robbietuk left a comment

Copy link
Copy Markdown
Collaborator

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
Copy Markdown
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
Copy Markdown
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.

@SomayehSaghamanesh SomayehSaghamanesh deleted the safir_updates branch February 10, 2025 15:27
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