summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ↵Edoardo Pasca2017-10-244-123/+77
|\ | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| * demo_parallel updatealgol2017-10-201-0/+12
| |
| * GH-OS fixed, demos updated, add_artifacts functionDaniil Kazantsev2017-10-194-123/+65
| |
* | Merge branch 'master' into pythonizeEdoardo Pasca2017-10-192-6/+22
|\|
| * OS loop now fixedDaniil Kazantsev2017-10-192-6/+22
| |
* | Merge branch 'master' into pythonizeEdoardo Pasca2017-10-191-2/+3
|\|
| * ordered subsets fix for GH termDaniil Kazantsev2017-10-181-2/+3
| |
* | Merge branch 'master' of ↵Edoardo Pasca2017-10-183-174/+115
|\| | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| * linked demos to TomoPhantom, cone beam demo, some FISTA modificastionsDaniil Kazantsev2017-10-183-174/+115
| |
* | Added data in hdf5 formatEdoardo Pasca2017-10-171-0/+0
| |
* | Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-111-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 hdf5Edoardo Pasca2017-08-231-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_raw3DEdoardo Pasca2017-10-111-1/+1
| | |
* | | export/import data from hdf5Edoardo Pasca2017-10-111-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 updatedDaniil Kazantsev2017-09-111-20/+42
| |
* | Ordered Subset FISTA added and demos updated in DemoRD2Daniil Kazantsev2017-08-031-21/+65
| |
* | some cleaning inside C functions, updated mex_compile file and the work on ↵Daniil Kazantsev2017-08-031-2/+2
|/ | | | ordered-subset FISTA started
* New regularizers for FISTADaniil Kazantsev2017-07-313-18/+15
|
* ring removal bug fixedalgol2017-07-051-3/+3
|
* FISTA_REC code optimized and cleanedalgol2017-07-051-5/+4
|
* some clearingDaniil Kazantsev2017-07-041-17/+17
|
* FISTA-GH bug fixedDaniil Kazantsev2017-07-032-7/+7
|
* Major reorganization, updated routinesDaniil Kazantsev2017-07-033-0/+400