Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use lower_case and new naming | Edoardo Pasca | 2018-03-14 | 1 | -29/+30 |
| | |||||
* | Merge remote-tracking branch 'origin' into rename_as_ccppetmr | Edoardo Pasca | 2018-03-14 | 3 | -578/+505 |
|\ | |||||
| * | Merge tv demo (#60) | jakobsj | 2018-03-14 | 3 | -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_ccppetmr | Edoardo Pasca | 2018-03-14 | 6 | -653/+592 |
|\| | |||||
| * | Moved geometries into framework and removed all references to geoms. (#57) | jakobsj | 2018-03-14 | 6 | -595/+588 |
| | | | | | | | | | | | | * Moved geometries into framework and removed all references to geoms. * New geometry names | ||||
* | | renaming according to CCPPETMR conventions | Edoardo Pasca | 2018-03-14 | 6 | -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_ops | Edoardo Pasca | 2018-03-14 | 1 | -11/+11 |
|/ | |||||
* | Add CGLS algorithm (#52) | jakobsj | 2018-03-14 | 3 | -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_fix | jakobsj | 2018-03-08 | 2 | -1/+1 |
|\ | | | | | Import also FBPD from algs, move tv demo to wip | ||||
| * | Import also FBPD from algs, move tv demo to wip | Jakob Jorgensen | 2018-03-08 | 2 | -1/+1 |
|/ | |||||
* | Implementation of FBPD algorithm and TV regularizer func (#49) | jakobsj | 2018-03-08 | 5 | -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_multichannel | jakobsj | 2018-03-08 | 10 | -111/+501 |
|\ | | | | | Dataset for multichannel | ||||
| * | fix of sinogram axis label | Edoardo Pasca | 2018-03-08 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of ↵ | Edoardo Pasca | 2018-03-08 | 1 | -4/+14 |
| |\ | |/ |/| | | | https://github.com/vais-ral/CCPi-ReconstructionFramework into dataset_for_multichannel | ||||
* | | fix simple_demo for cpu fanbeam (#44) | jakobsj | 2018-03-07 | 2 | -5/+15 |
| | | |||||
* | | New datasetprocessors (#41) | Edoardo Pasca | 2018-03-07 | 0 | -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 imports | Edoardo Pasca | 2018-03-08 | 2 | -21/+13 |
| | | |||||
| * | Simple Demo uses the updated VolumeData and SinogramData | Edoardo Pasca | 2018-03-08 | 1 | -5/+4 |
| | | |||||
| * | Multichannel projectors inherit from single channel ones | Edoardo Pasca | 2018-03-08 | 1 | -111/+29 |
| | | |||||
| * | SinogramData and VolumeData use geometry for initialization | Edoardo Pasca | 2018-03-08 | 1 | -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 VolumeData | Edoardo Pasca | 2018-03-08 | 1 | -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 Geometries | Edoardo Pasca | 2018-03-08 | 2 | -4/+5 |
| | | |||||
| * | changed default values | Edoardo Pasca | 2018-03-08 | 2 | -31/+50 |
| | | |||||
| * | added subdir astra (TO BE REMOVED) | Edoardo Pasca | 2018-03-07 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'multichannel_adapt' of ↵ | Edoardo Pasca | 2018-03-07 | 6 | -122/+582 |
| |\ | | | | | | | | | | https://github.com/vais-ral/CCPi-ReconstructionFramework into dataset_for_multichannel | ||||
| | * | FISTA seems working with MC | Jakob Jorgensen | 2018-03-07 | 2 | -3/+44 |
| | | | |||||
| | * | MC FP and BP working | Jakob Jorgensen | 2018-03-07 | 4 | -25/+267 |
| | | | |||||
| | * | Extended geoms with channels attribute, added experimental mc demo script | Jakob Jorgensen | 2018-03-07 | 2 | -20/+68 |
| |/ |/| | |||||
* | | ASTRA fp and bp as datasetprocessors used by operator (#39) | jakobsj | 2018-03-07 | 3 | -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 variables | Edoardo Pasca | 2018-03-07 | 2 | -13/+43 |
| | | |||||
| * | moved work-in-progress files to wip | Edoardo Pasca | 2018-03-06 | 3 | -0/+0 |
|/ | |||||
* | fix dataset issue in processor (#38) | jakobsj | 2018-03-06 | 1 | -2/+3 |
| | |||||
* | New datasetprocessors (#36) | Edoardo Pasca | 2018-03-06 | 2 | -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 ↵ | jakobsj | 2018-03-06 | 2 | -13/+74 |
| | | | | 2D (#35) | ||||
* | Geoms into datasets #15, #16 (#34) | jakobsj | 2018-03-06 | 3 | -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 Pasca | 2018-03-06 | 2 | -1/+169 |
| | | | | | | | | * added simple test for SinogramData * initial version of processors This contains a version of a simple normalization algorithm. | ||||
* | Geometry (#31) | jakobsj | 2018-03-06 | 3 | -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 type | Edoardo Pasca | 2018-02-27 | 1 | -16/+19 |
| | |||||
* | Simple demo fix (#11) | jakobsj | 2018-02-27 | 2 | -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 Pasca | 2018-02-22 | 8 | -7/+65 |
|\ | | | | | | | https://github.com/vais-ral/CCPi-ReconstructionFramework | ||||
| * | some changes | algol | 2018-02-22 | 8 | -7/+65 |
| | | |||||
* | | few fixes | Edoardo Pasca | 2018-02-22 | 1 | -72/+30 |
|/ | |||||
* | minor changes | Edoardo Pasca | 2018-02-21 | 1 | -9/+10 |
| | |||||
* | Added Test | Edoardo Pasca | 2018-02-21 | 1 | -0/+102 |
| | |||||
* | moved modular FISTA here | Edoardo Pasca | 2018-02-21 | 4 | -0/+507 |
| | |||||
* | added sum | Edoardo Pasca | 2018-02-21 | 1 | -0/+3 |
| | |||||
* | Arithmetic operators and python 2/3 compatibility (#8) | Edoardo Pasca | 2018-02-18 | 2 | -39/+245 |
| | | | | | | | | | | | | * Added arithmetic operations WIP * fixes for python 2 and 3 added arithmetic operators * updated operators and test * updated tests | ||||
* | initial work and example | Edoardo Pasca | 2018-02-06 | 2 | -382/+400 |
| | |||||
* | Working chainable DataSetProcessors | Edoardo Pasca | 2018-01-31 | 5 | -437/+229 |
| | |||||
* | Work in progress | Edoardo Pasca | 2018-01-30 | 3 | -0/+701 |
| |