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

block and generic scanner geometry #577

Merged
merged 99 commits into from
Feb 19, 2022
Merged
Show file tree
Hide file tree
Changes from 94 commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
c42611b
modification for block geometry
Aug 20, 2018
4c62a51
Implementation of the generic geometry
roemicha Aug 31, 2018
b8c92a0
crystal map only asked if 'Generic' and built-in error for maps
roemicha Oct 1, 2018
cf4340e
corrections for issue 1
roemicha Oct 12, 2018
616d8c6
issue #2 first patch of corrections
roemicha Oct 12, 2018
db527c0
Update 2 for issue 2
roemicha Nov 7, 2018
214fdb5
megre devBlock with ucl/master and resolve conflicts
Jun 4, 2020
f7df3b9
add license
Jun 12, 2020
2e71b94
Merge branch 'master' into master
Jun 12, 2020
c76f3fa
Merge branch 'master' into block_projectors
KrisThielemans Jul 11, 2020
7b8d791
minor clean-up in GeometryBlocksOnCylindrical
KrisThielemans Jul 13, 2020
38cd06b
removed some commented out lines in the SAFIR OSMAPOSL .par file
KrisThielemans Jul 13, 2020
7f0794a
fix bug: set default scanner geometry as cylindrical to avoid errors …
Jul 16, 2020
db65ef2
add SAFIRDualRingPrototype to the list of defined scanners
Jul 16, 2020
c948ae2
small leftovers from block/generic implementation
Jul 16, 2020
57a54f0
add new utilities
Jul 16, 2020
a311276
small fix
Jul 16, 2020
097977b
fix a bug
Jul 29, 2020
1fc463a
Merge branch 'master' into block_projectors
KrisThielemans Oct 23, 2020
7f70430
update test inputs according to the new version
Nov 5, 2020
6f6af62
Merge branch 'master' of https://github.com/pkhateri/STIR
Nov 5, 2020
fc96b10
fix a small bug
Nov 5, 2020
ad37c7d
fix a bug and update generate_input_data for PET_simulation example
Nov 15, 2020
269b913
added few fix suggested by Kris
Nov 15, 2020
172a12a
Merge branch 'master' into master
Nov 15, 2020
d4eb363
update test
Nov 15, 2020
ca00a3f
fix a bug
Nov 15, 2020
6f32234
Merge branch 'master' into master
Feb 19, 2021
642438a
fix a bug
Feb 19, 2021
f32690a
delete utilities discussed with Kris
Feb 22, 2021
543f95b
Merge branch 'master' of https://github.com/pkhateri/STIR
Feb 22, 2021
2c5d289
remove utilities name from cmakelist file
Feb 22, 2021
9edf75e
make ProjDataInfoBlocksOnCylindricalNoArcCorr::get_s safer
KrisThielemans Mar 18, 2021
04cbdf6
Merge branch 'master' into master
Apr 7, 2021
b0e4f4a
bux fixed for test_DataSymmetriesForBins_PET_CartesianGrid
danieldeidda Sep 14, 2021
72929c4
BlockOnCylindrical:
danieldeidda Nov 3, 2021
7cea90c
BlocksOnCylindrical updates
VietAnhDao Nov 9, 2021
081f72e
Merge remote-tracking branch 'origin/master' into BlocksSTIRparisa
KrisThielemans Nov 10, 2021
05cd5ae
remove non-ASCII character in comment
KrisThielemans Nov 10, 2021
f2a2a26
Merge remote-tracking branch 'origin/master' into BlocksSTIRparisa
KrisThielemans Nov 11, 2021
d0284d0
update ProjDataInfoGeneric from Blocks*
KrisThielemans Nov 11, 2021
bfdca58
made ProjDataInfoBlocksOnCylindrical identical to ProjDataInfoGeneric
KrisThielemans Nov 12, 2021
66201e6
update copyright/authorship for blocks-code
KrisThielemans Nov 12, 2021
e35385c
minor updates to blocks code
KrisThielemans Nov 12, 2021
bb0b558
Derive ProjDataInfoBlocksOnCylindricalNoArcCorr from Generic
KrisThielemans Nov 12, 2021
b85cf69
ProjDataInfoGeneric: update initalisation call
KrisThielemans Nov 12, 2021
b57f472
gitignore output of test
KrisThielemans Nov 12, 2021
7ec9546
testing Proj.get_s() =lorBlocks.s()
danieldeidda Nov 16, 2021
42bf1e9
shifting the first detector index to the first crystal in the firts b…
danieldeidda Nov 29, 2021
cde7f2d
Merge branch 'master' into master
KrisThielemans Nov 30, 2021
503cc56
derive ProjDataInfoGeneric from ProjDataInfoCylindrical
KrisThielemans Nov 29, 2021
319d753
[SWIG] ProjDataInfo changes
KrisThielemans Dec 3, 2021
df9b2fa
[SWIG] ProjDataInfo changes
KrisThielemans Dec 3, 2021
4c5027a
remove scanner orientation from Interfile and parameter_info
KrisThielemans Dec 3, 2021
d0a5e8d
Merge branch 'master' of https://github.com/pkhateri/STIR into Blocks…
danieldeidda Dec 3, 2021
50e1161
-Expose LOR coordinate;
danieldeidda Dec 6, 2021
0212f0a
split Scanner:read_detectormap_from_file
KrisThielemans Dec 8, 2021
5d5e68d
update plot_scanner_LOR with example of plot from LORcoordinate;
danieldeidda Dec 8, 2021
c150839
Merge branch 'master' of https://github.com/pkhateri/STIR into Blocks…
danieldeidda Dec 8, 2021
4de493f
move listmode/DetectorCoordinateMapFromFile to buildblock/DetectorCoo…
KrisThielemans Dec 9, 2021
7ab3622
update plot_scanner_LOR:
danieldeidda Dec 10, 2021
96798d6
use DetectorCoordinateMap in Scanner
KrisThielemans Dec 10, 2021
93d188e
add comparison operators to DetectionPosition
KrisThielemans Dec 11, 2021
6516c76
simplify GeometryBlocksOnCylindrical
KrisThielemans Dec 11, 2021
4d9830b
minor clean-up of test_proj_data_info
KrisThielemans Dec 12, 2021
195c3e8
derived GeometryBlocksOnCylindrical from DetectorCoordinateMap
KrisThielemans Dec 12, 2021
3750b0a
moved detpos to coordinate to DetectorCoordinateMap
KrisThielemans Dec 12, 2021
869a525
remove duplication in crystal_map code
KrisThielemans Dec 12, 2021
bd63609
Generic/Blocks: remove obsolete variables
KrisThielemans Dec 12, 2021
de20df3
Merge branch 'FewerMaps' into BlocksSTIRparisa
KrisThielemans Dec 12, 2021
b508560
Merge remote-tracking branch 'origin/master' into BlocksSTIRparisa
KrisThielemans Dec 12, 2021
be9f8e8
add missing include <map>
KrisThielemans Dec 13, 2021
02c7e4a
support multiple buckets axially
danieldeidda Dec 13, 2021
bab46a6
git ignore more output of SAFIR test script
KrisThielemans Dec 16, 2021
12a400a
Re-work SAFIR listmode code
KrisThielemans Dec 16, 2021
d188992
add scanner.set_up()
KrisThielemans Dec 16, 2021
1bf66a7
blocks: disable sorting of detectors for now
KrisThielemans Dec 16, 2021
1cd049b
adding test_DetectorCoordinateMap.cxx
danieldeidda Dec 16, 2021
b8b3f1f
change test name
danieldeidda Dec 16, 2021
9508ab1
- make DetectioPosMapTests friend class of Scanner
danieldeidda Dec 22, 2021
78d611a
use make_shared() for pointers;
danieldeidda Jan 11, 2022
1f06a94
add get_m test (it's failing now)
danieldeidda Jan 12, 2022
ef507d1
Creating z_shift for coordinates to make cylindrical and blocksOnCyli…
danieldeidda Jan 21, 2022
e20ef08
fix z_shift repetition in ProjDataInfoGeneric...
danieldeidda Jan 24, 2022
b86ff41
[skip ci] modify tests documentation
danieldeidda Jan 25, 2022
656889a
[skip ci] modify tests documentation
danieldeidda Jan 25, 2022
5147f7b
fixing error with negative view offset
danieldeidda Feb 14, 2022
e9e6990
ci-skip changed name of test
danieldeidda Feb 14, 2022
5284c24
Merge remote-tracking branch 'origin/master' into BlocksSTIRparisa
KrisThielemans Feb 14, 2022
d0f26d7
[Appveyor] run ctest with --output-on-failure
KrisThielemans Feb 15, 2022
20bfaeb
reduced verbosity and warnings in test_blocks_on_cylindrical_projectors
KrisThielemans Feb 15, 2022
95af0dd
remove repetition code in test by using a function, change warning f…
danieldeidda Feb 17, 2022
e50aeb0
disabling cache
danieldeidda Feb 17, 2022
50c0fee
kill warnings and correct typo for enable_cache(false)
danieldeidda Feb 18, 2022
894842f
Update src/include/stir/ProjDataInfoGeneric.inl
danieldeidda Feb 18, 2022
7e75c24
Update src/include/stir/ProjDataInfoGeneric.inl
danieldeidda Feb 18, 2022
026ba19
clean-up repetition by using template function and fix white spacing
danieldeidda Feb 18, 2022
b6878e5
Merge branch 'master' of https://github.com/pkhateri/STIR into getm_fix
danieldeidda Feb 18, 2022
535c5ce
update release notes for block feature [ci skip]
KrisThielemans Feb 19, 2022
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
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ build_script:

test_script:
- cd C:\projects\stir\build
- ctest -VV -C %CONFIGURATION%
- ctest --output-on-failure -C %CONFIGURATION%
- cd ..\recon_test_pack
- run_tests --nointbp "C:\projects\stir\install\bin\"
16 changes: 15 additions & 1 deletion documentation/release_5.0.htm
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,15 @@ <h3>Changes breaking backwards compatibility from a user-perspective</h3>
STIR usages of these methods (OSSPS and SqrtHessianRowSum) have been updated to see no effective change in functionality.
However, calling the Hessian vector product methods, via python etc., will result in a change in functionality as the sign of the output voxel values has changed.
</li>

<li> Python/MATLAB wrappers no longer have <code>ProjDataInfo::ProjDataInfoCTI</code>, use <code>ProjDataInfo::construct_proj_data_info</code> instead.
However, this now returns an object of the appropriate (derived) type as opposed to just
<code>ProjDataInfo</code>. This should be transparant, except apparently for testing equality of objects.
</li>
</ul>



<h3>Bug fixes</h3>
<ul>
<li>
Expand Down Expand Up @@ -278,7 +284,13 @@ <h3>Backward incompatibities</h3>
<li>Poisson log-likelihood hierarchy has changed for gradient methods to now use <tt>actual_compute_subset_gradient_without_penalty</tt>
in the derived classes (which has an extra argument <tt>add_sensitivity</tt>). Therefore developers that created their own derived class will need to
adjust their class accordingly. The <tt>public</tt> class interface is identical though.
</li>
</li>
<li><code>DetectorCoordinateMapFromfile</code> (used by SAFIR listmode files) has been renamed to <code>DetectorCoordinateMap</code> and moved from <tt>listmode</tt> to <tt>buildblock</tt>.</li>
<li><code>Scanner</code> now has a <code>set_up()</code> function. This needs to be called after
using any of the <code>set_*()</code> functions (except <code>set_params</code>). For the blocks/generic
scanners, this will fill in the detector maps etc.
You will get a run-time exception if you forgot to do this.
</li>
</ul>

<h3>New functionality</h3>
Expand Down Expand Up @@ -308,6 +320,8 @@ <h3>New functionality</h3>
</li>
<li><code>KeyParser::parameter_info()</code> now outputs vectorised keys as well
</li>
<li><code>DetectionPosition</code> now has all comparison operators.
</li>
<li><code>LOR</code> classes now no longer require phi at input to be between 0 and pi,
nor psi to be between 0 and 2 pi. They will standardise the input automatically.
</li>
Expand Down
1 change: 1 addition & 0 deletions examples/PET_simulation/generate_input_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ echo "=== create template sinogram (DSTE in 3D with max ring diff 1 to save tim
template_sino=my_DSTE_3D_rd1_template.hs
cat > my_input.txt <<EOF
Discovery STE

1
n

Expand Down
4 changes: 4 additions & 0 deletions examples/SAFIR_genericScanner/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
test_generic_implementation*
test_forward*
test_*.*v
sens_*.*v
Loading