Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into pythonize | Edoardo Pasca | 2017-10-19 | 1 | -2/+3 |
|\ | |||||
| * | ordered subsets fix for GH term | Daniil Kazantsev | 2017-10-18 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' of ↵ | Edoardo Pasca | 2017-10-18 | 3 | -174/+115 |
|\| | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize | ||||
| * | linked demos to TomoPhantom, cone beam demo, some FISTA modificastions | Daniil Kazantsev | 2017-10-18 | 3 | -174/+115 |
| | | |||||
* | | Added data in hdf5 format | Edoardo Pasca | 2017-10-17 | 1 | -0/+0 |
| | | |||||
* | | Merge branch 'pythonize' of ↵ | Edoardo Pasca | 2017-10-11 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize Conflicts: demos/exportDemoRD2Data.m main_func/regularizers_CPU/FGP_TV_core.h main_func/regularizers_CPU/LLT_model.c src/Python/test/readhd5.py src/Python/test_reconstructor.py src/Python/test_regularizers.py | ||||
| * | | export/import data from hdf5 | Edoardo Pasca | 2017-08-23 | 1 | -0/+35 |
| | | | | | | | | | | | | | | | Added file to export the data from DemoRD2.m to HDF5 to pass it to Python. Added file to import the data from DemoRD2.m from HDF5. | ||||
* | | | comment out clear of data_raw3D | Edoardo Pasca | 2017-10-11 | 1 | -1/+1 |
| | | | |||||
* | | | export/import data from hdf5 | Edoardo Pasca | 2017-10-11 | 1 | -0/+35 |
| |/ |/| | | | | | | | Added file to export the data from DemoRD2.m to HDF5 to pass it to Python. Added file to import the data from DemoRD2.m from HDF5. | ||||
* | | 2 new GPU regularizers, FGP objective fixed, FISTA_REC updated | Daniil Kazantsev | 2017-09-11 | 1 | -20/+42 |
| | | |||||
* | | Ordered Subset FISTA added and demos updated in DemoRD2 | Daniil Kazantsev | 2017-08-03 | 1 | -21/+65 |
| | | |||||
* | | some cleaning inside C functions, updated mex_compile file and the work on ↵ | Daniil Kazantsev | 2017-08-03 | 1 | -2/+2 |
|/ | | | | ordered-subset FISTA started | ||||
* | New regularizers for FISTA | Daniil Kazantsev | 2017-07-31 | 3 | -18/+15 |
| | |||||
* | ring removal bug fixed | algol | 2017-07-05 | 1 | -3/+3 |
| | |||||
* | FISTA_REC code optimized and cleaned | algol | 2017-07-05 | 1 | -5/+4 |
| | |||||
* | some clearing | Daniil Kazantsev | 2017-07-04 | 1 | -17/+17 |
| | |||||
* | FISTA-GH bug fixed | Daniil Kazantsev | 2017-07-03 | 2 | -7/+7 |
| | |||||
* | Major reorganization, updated routines | Daniil Kazantsev | 2017-07-03 | 3 | -0/+400 |