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

Added the Philips Vereos to the list of scanners #11

Closed
wants to merge 22 commits into from
Closed
Show file tree
Hide file tree
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 Jul 13, 2016
9d623a6
Syncing with the upstream with the hope that an older commit in my ma…
NikEfth Aug 16, 2016
3cec752
Reverted changes on Reconstruction which allowed the user to save the
NikEfth Aug 16, 2016
71c25ea
Merge branch 'master' of https://github.com/UCL/STIR
Jun 16, 2017
62d0e42
More Conflict
Jun 16, 2017
c97d280
Merge remote-tracking branch 'upstream/master'
NikEfth Jul 19, 2017
6fed176
Merge remote-tracking branch 'upstream/master'
NikEfth Aug 25, 2017
9452100
Merge remote-tracking branch 'upstream/master'
NikEfth Sep 15, 2017
9553c0e
Merge remote-tracking branch 'upstream/master'
NikEfth Nov 7, 2017
67b3191
Merge remote-tracking branch 'origin/master'
NikEfth Nov 7, 2017
4f150c7
Added the Philips Vereos to the list of scanners
jesusqubio Apr 22, 2019
db00b81
Merge branch 'simset_input' of https://github.com/NikEfth/STIR into s…
jesusqubio Apr 22, 2019
dcfb1fd
Minor changes to the Philips Vereos model
jesusqubio May 13, 2019
fc185ed
Merge branch 'simset_input' of https://github.com/NikEfth/STIR into s…
jesusqubio May 13, 2019
d2956e6
Merge remote-tracking branch 'upstream/simset_input' into simset_input
jesusqubio Jun 5, 2019
0248ff4
Added the Philips Vereos to the list of scanners
jesusqubio Apr 22, 2019
cfea82e
Minor changes to the Philips Vereos model
jesusqubio May 13, 2019
bcd5bed
Merge branch 'simset_input' of https://github.com/txusser/STIR into s…
Jul 10, 2019
156012c
Merge branch 'upstream/simset_input' into simset_input
Jul 10, 2019
ca1af30
Merge branch 'upstream/simset_input' into simset_input
jesusqubio Jul 19, 2019
0c2bc89
Merged Nikos changes
jesusqubio Oct 10, 2019
6053be9
Merged changes
jesusqubio Oct 10, 2019
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
9 changes: 9 additions & 0 deletions src/buildblock/Scanner.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,15 @@ Scanner::Scanner(Type scanner_type)
1);
break;

case Vereos:
// Courtesy of Jesus Silva, Molecular Imaging Research Group, Health Research Institute of Santiago de Compostela, Galicia, Spain
set_params(Vereos, string_list("Philips Vereos", "Vereos"),
40, 306, 612,
382.0F, 11.0F, 4.1026F, 2.2876F, 0.0F,
1, 1, 40, 34, 1, 1, 1);
break;


case GeminiTF:
set_params(GeminiTF,string_list("GeminiTF", "Philips GeminiTF"),
44, 322, 287, // Based on GATE output - Normally it is 644 detectors at each of the 44 rings
Expand Down
2 changes: 1 addition & 1 deletion src/include/stir/Scanner.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class Scanner
*/
enum Type {E931, E951, E953, E921, E925, E961, E962, E966, E1080, Siemens_mMR, Siemens_mCT, RPT,HiDAC,
Advance, DiscoveryLS, DiscoveryST, DiscoverySTE, DiscoveryRX, Discovery600, Discovery690,
HZLR, RATPET, PANDA, HYPERimage, nanoPET, HRRT, Allegro, GeminiTF, User_defined_scanner,
HZLR, RATPET, PANDA, HYPERimage, nanoPET, HRRT, Allegro, Vereos, GeminiTF, User_defined_scanner,
Unknown_scanner};

//! constructor that takes scanner type as an input argument
Expand Down
6 changes: 3 additions & 3 deletions src/recon_buildblock/IterativeReconstruction.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Comment on lines +403 to +404
Copy link
Collaborator

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

{
this->stop_timers();
return Succeeded::no;
}

this->stop_timers();

return this->reconstruct(this->target_data_sptr);
return this->reconstruct(target_data_sptr);
Copy link
Collaborator

Choose a reason for hiding this comment

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

and revert this

}

template <typename TargetT>
Expand Down
2 changes: 1 addition & 1 deletion src/recon_test/recontest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Collaborator

Choose a reason for hiding this comment

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

this is incorrect. revert

}
else
{
Expand Down