summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* use lower_case and new namingEdoardo Pasca2018-03-141-29/+30
|
* Merge remote-tracking branch 'origin' into rename_as_ccppetmrEdoardo Pasca2018-03-143-578/+505
|\
| * Merge tv demo (#60)jakobsj2018-03-143-581/+504
| | | | | | | | | | | | | | | | * Moved geometries into framework and removed all references to geoms. * Merged TV demo into simple_demo * Common colormap disply recons
* | Merge remote-tracking branch 'origin' into rename_as_ccppetmrEdoardo Pasca2018-03-146-653/+592
|\|
| * Moved geometries into framework and removed all references to geoms. (#57)jakobsj2018-03-146-595/+588
| | | | | | | | | | | | * Moved geometries into framework and removed all references to geoms. * New geometry names
* | renaming according to CCPPETMR conventionsEdoardo Pasca2018-03-146-140/+139
| | | | | | | | | | | | | | | | | | | | Renamed VolumeData to ImageData Renamed SinogramData to AcquisitionData NOT renamed DataSetProcessor methods are now lower_case not camelCase Moved astra_processor to package astra Updated the demos
* | moved astra_opsEdoardo Pasca2018-03-141-11/+11
|/
* Add CGLS algorithm (#52)jakobsj2018-03-143-2/+106
| | | | | | | | | | | | | | | * Added modular CGLS alg and use it in simple_demo * CGLS demo plot titles #51 * Increase num CGLS iters * CGLS: Added copy of b to r and x_init to x * Added clone method to DataSet Use clone in CGLS Added many plots to demo
* Merge pull request #50 from vais-ral/fbpd_small_fixjakobsj2018-03-082-1/+1
|\ | | | | Import also FBPD from algs, move tv demo to wip
| * Import also FBPD from algs, move tv demo to wipJakob Jorgensen2018-03-082-1/+1
|/
* Implementation of FBPD algorithm and TV regularizer func (#49)jakobsj2018-03-085-11/+188
| | | | | | | | | | | | * Added FBPD alg for LS+1norm in simple_demo * Replaced dir_op/adj_op by operator in func * WIP: implement finite diff op * FBPD TV working: TV and Norm2 funcs, FiniteDiff2D op #46 * Remove unnecessary FISTA call #46
* Merge pull request #47 from vais-ral/dataset_for_multichanneljakobsj2018-03-0810-111/+501
|\ | | | | Dataset for multichannel
| * fix of sinogram axis labelEdoardo Pasca2018-03-081-2/+2
| |
| * Merge branch 'master' of ↵Edoardo Pasca2018-03-081-4/+14
| |\ | |/ |/| | | https://github.com/vais-ral/CCPi-ReconstructionFramework into dataset_for_multichannel
* | fix simple_demo for cpu fanbeam (#44)jakobsj2018-03-072-5/+15
| |
* | New datasetprocessors (#41)Edoardo Pasca2018-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * added simple test for SinogramData * initial version of processors This contains a version of a simple normalization algorithm. * added default pixel size = 1 (mm) * Added FindCenter of rotation for parallel beam geometry closes #5
| * cleaned importsEdoardo Pasca2018-03-082-21/+13
| |
| * Simple Demo uses the updated VolumeData and SinogramDataEdoardo Pasca2018-03-081-5/+4
| |
| * Multichannel projectors inherit from single channel onesEdoardo Pasca2018-03-081-111/+29
| |
| * SinogramData and VolumeData use geometry for initializationEdoardo Pasca2018-03-081-52/+148
| | | | | | | | | | | | One can now pass the sinogram geometry or volume geometry to initialize the SinogramData or VolumeData. It handles multichannel data.
| * Multichannel processor works with SinogramData and VolumeDataEdoardo Pasca2018-03-081-16/+20
| | | | | | | | | | Internally the processor allocates the memory for sinograms and volume data, passing SinogramGeometry and VolumeGeometry to SinogramData and VolumeData.
| * moved files and use SinogramData/VolumeData and GeometriesEdoardo Pasca2018-03-082-4/+5
| |
| * changed default valuesEdoardo Pasca2018-03-082-31/+50
| |
| * added subdir astra (TO BE REMOVED)Edoardo Pasca2018-03-071-1/+1
| |
| * Merge branch 'multichannel_adapt' of ↵Edoardo Pasca2018-03-076-122/+582
| |\ | | | | | | | | | https://github.com/vais-ral/CCPi-ReconstructionFramework into dataset_for_multichannel
| | * FISTA seems working with MCJakob Jorgensen2018-03-072-3/+44
| | |
| | * MC FP and BP workingJakob Jorgensen2018-03-074-25/+267
| | |
| | * Extended geoms with channels attribute, added experimental mc demo scriptJakob Jorgensen2018-03-072-20/+68
| |/ |/|
* | ASTRA fp and bp as datasetprocessors used by operator (#39)jakobsj2018-03-073-87/+216
| | | | | | | | | | | | | | | | | | | | | | | | * Remove astra vol_geom and proj_geom from astra_op * Moved astra fp and bp from op into processor * Moved all astra from op into datasetproc * Moved geometry conversion to new astra_utils, clean up * two minor fixes
| * bugfix in subset, initialize processor with variablesEdoardo Pasca2018-03-072-13/+43
| |
| * moved work-in-progress files to wipEdoardo Pasca2018-03-063-0/+0
|/
* fix dataset issue in processor (#38)jakobsj2018-03-061-2/+3
|
* New datasetprocessors (#36)Edoardo Pasca2018-03-062-10/+312
| | | | | | | | | | | | | | * added simple test for SinogramData * initial version of processors This contains a version of a simple normalization algorithm. * added default pixel size = 1 (mm) * Added FindCenter of rotation for parallel beam geometry closes #5
* Added all parallel/cone/2D/3D operators and updated simple_demo to test cone ↵jakobsj2018-03-062-13/+74
| | | | 2D (#35)
* Geoms into datasets #15, #16 (#34)jakobsj2018-03-063-38/+55
| | | | | | | | * Added vol and sino geoms into vol and sino data sets and in astra operator * Moved geometry attribute up to DataSet * Added copying of geometry in DataSet arithmetic operations
* New datasetprocessors (#33)Edoardo Pasca2018-03-062-1/+169
| | | | | | | | * added simple test for SinogramData * initial version of processors This contains a version of a simple normalization algorithm.
* Geometry (#31)jakobsj2018-03-063-3/+168
| | | | | | | | | | | | | | | | * started geometry * Simple geometry implemented #2 * sino geometry simplified to standard * Added get min/max methods vol geom * Basic vol and sino geoms working in astra_op and simple_demo * Fixed style * Added center/offset to vol geom.
* Arithmetic operators return actual typeEdoardo Pasca2018-02-271-16/+19
|
* Simple demo fix (#11)jakobsj2018-02-272-2/+101
| | | | | | * Added simple demo and removed DataSet in sum() * Adds methods for #9, simple demo working, type/error checks still missing.
* Merge branch 'master' of ↵Edoardo Pasca2018-02-228-7/+65
|\ | | | | | | https://github.com/vais-ral/CCPi-ReconstructionFramework
| * some changesalgol2018-02-228-7/+65
| |
* | few fixesEdoardo Pasca2018-02-221-72/+30
|/
* minor changesEdoardo Pasca2018-02-211-9/+10
|
* Added TestEdoardo Pasca2018-02-211-0/+102
|
* moved modular FISTA hereEdoardo Pasca2018-02-214-0/+507
|
* added sumEdoardo Pasca2018-02-211-0/+3
|
* Arithmetic operators and python 2/3 compatibility (#8)Edoardo Pasca2018-02-182-39/+245
| | | | | | | | | | | | * Added arithmetic operations WIP * fixes for python 2 and 3 added arithmetic operators * updated operators and test * updated tests
* initial work and exampleEdoardo Pasca2018-02-062-382/+400
|
* Working chainable DataSetProcessorsEdoardo Pasca2018-01-315-437/+229
|
* Work in progressEdoardo Pasca2018-01-303-0/+701
|