-
Notifications
You must be signed in to change notification settings - Fork 2
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
Added the Philips Vereos to the list of scanners #11
Closed
Closed
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
efed646
Merge branch '_reconstruct_without_output'
NikEfth 9d623a6
Syncing with the upstream with the hope that an older commit in my ma…
NikEfth 3cec752
Reverted changes on Reconstruction which allowed the user to save the
NikEfth 71c25ea
Merge branch 'master' of https://github.com/UCL/STIR
62d0e42
More Conflict
c97d280
Merge remote-tracking branch 'upstream/master'
NikEfth 6fed176
Merge remote-tracking branch 'upstream/master'
NikEfth 9452100
Merge remote-tracking branch 'upstream/master'
NikEfth 9553c0e
Merge remote-tracking branch 'upstream/master'
NikEfth 67b3191
Merge remote-tracking branch 'origin/master'
NikEfth 4f150c7
Added the Philips Vereos to the list of scanners
jesusqubio db00b81
Merge branch 'simset_input' of https://github.com/NikEfth/STIR into s…
jesusqubio dcfb1fd
Minor changes to the Philips Vereos model
jesusqubio fc185ed
Merge branch 'simset_input' of https://github.com/NikEfth/STIR into s…
jesusqubio d2956e6
Merge remote-tracking branch 'upstream/simset_input' into simset_input
jesusqubio 0248ff4
Added the Philips Vereos to the list of scanners
jesusqubio cfea82e
Minor changes to the Philips Vereos model
jesusqubio bcd5bed
Merge branch 'simset_input' of https://github.com/txusser/STIR into s…
156012c
Merge branch 'upstream/simset_input' into simset_input
ca1af30
Merge branch 'upstream/simset_input' into simset_input
jesusqubio 0c2bc89
Merged Nikos changes
jesusqubio 6053be9
Merged changes
jesusqubio File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -400,16 +400,16 @@ reconstruct() | |
{ | ||
this->start_timers(); | ||
|
||
this->target_data_sptr.reset(this->get_initial_data_ptr()); | ||
if (this->set_up(this->target_data_sptr) == Succeeded::no) | ||
shared_ptr<TargetT > target_data_sptr(this->get_initial_data_ptr()); | ||
if (this->set_up(target_data_sptr) == Succeeded::no) | ||
{ | ||
this->stop_timers(); | ||
return Succeeded::no; | ||
} | ||
|
||
this->stop_timers(); | ||
|
||
return this->reconstruct(this->target_data_sptr); | ||
return this->reconstruct(target_data_sptr); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and revert this |
||
} | ||
|
||
template <typename TargetT> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -84,7 +84,7 @@ int main(int argc, const char *argv[]) | |
{ | ||
t.stop(); | ||
std::cout << "Total Wall clock time: " << t.value() << " seconds" << std::endl; | ||
return EXIT_SUCCESS; | ||
return Succeeded::yes; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is incorrect. revert |
||
} | ||
else | ||
{ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see no reason for this. It doesn't belong in this PR anyway. Please revert