summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use MATCH and CMAKE_MATCH_<n>Edoardo Pasca2017-10-251-12/+6
* Bugfixes for UNIX compilationEdoardo Pasca2017-10-233-84/+52
* executable extension is for WIN32Edoardo Pasca2017-10-231-2/+6
* Finds the active conda environmentEdoardo Pasca2017-10-231-4/+56
* Added setup.py.inEdoardo Pasca2017-10-231-0/+67
* Add needed environment variablesEdoardo Pasca2017-10-233-6/+30
* Merge branch origin/pythonize into pythonizeEdoardo Pasca2017-10-202-169/+143
|\
| * Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-2013-309/+601
| |\
| * | Further developmentEdoardo Pasca2017-10-202-55/+81
| * | finished first draftEdoardo Pasca2017-10-191-115/+21
| * | further progressEdoardo Pasca2017-10-191-34/+54
| * | progress in pythonizationEdoardo Pasca2017-10-191-22/+44
* | | add conda-forge to the channelEdoardo Pasca2017-10-201-1/+1
| |/ |/|
* | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-202-1/+2
|\ \
| * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+79
| * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+4
* | | Initial revision of build environment made with CMakeEdoardo Pasca2017-10-209-0/+336
|/ /
* | Merge branch 'master' into pythonizeEdoardo Pasca2017-10-193-15/+48
|\ \
| * | OS loop now fixedDaniil Kazantsev2017-10-193-27/+44
| * | Merge pull request #6 from vais-ral/if-then-elsedkazanc2017-10-191-39/+15
| |\ \
| | * | moved code out of if-then-elseEdoardo Pasca2017-10-191-39/+15
| |/ /
* | | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-193-89/+594
|\ \ \ | | |/ | |/|
| * | added to repositoryEdoardo Pasca2017-10-181-0/+379
| * | implemented non ordered subset FISTA in reconstructorEdoardo Pasca2017-10-182-25/+165
| * | minor reorganization of the codeEdoardo Pasca2017-10-181-52/+45
| * | Modified Region of interest; removed studenttEdoardo Pasca2017-10-181-14/+7
* | | moved code out of if-the-elseEdoardo Pasca2017-10-191-39/+15
* | | Merge branch 'master' into pythonizeEdoardo Pasca2017-10-192-76/+108
|\ \ \ | | |/ | |/|
| * | ordered subsets fix for GH termDaniil Kazantsev2017-10-182-76/+108
* | | Merge branch 'master' of https://github.com/vais-ral/CCPi-FISTA_Reconstructio...Edoardo Pasca2017-10-184-265/+179
|\| | | |/ |/|
| * linked demos to TomoPhantom, cone beam demo, some FISTA modificastionsDaniil Kazantsev2017-10-184-265/+179
* | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-181-0/+0
|\ \
| * | Progress in pythonizationEdoardo Pasca2017-10-172-35/+298
| * | Added data in hdf5 formatEdoardo Pasca2017-10-172-0/+0
* | | removed viewer package from treeEdoardo Pasca2017-10-1811-1987/+0
* | | Progress in pythonizationEdoardo Pasca2017-10-182-35/+298
* | | Squashing 2 commits: Added and removed hdf5 (too big)Edoardo Pasca2017-10-181-0/+0
|/ /
* | Added many methodsEdoardo Pasca2017-10-171-24/+160
* | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-1323-285/+1582
|\ \
| * \ Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-1110-58/+990
| |\ \
| * | | initial revisionEdoardo Pasca2017-10-111-0/+25
| * | | read and plot the hdf5Edoardo Pasca2017-10-111-1/+14
| * | | comment out clear of data_raw3DEdoardo Pasca2017-10-111-1/+1
| * | | table with regularizers outputEdoardo Pasca2017-10-111-33/+33
| * | | initial revisionEdoardo Pasca2017-10-111-0/+0
| * | | initial revisionEdoardo Pasca2017-10-111-0/+0
| * | | initial facility to test the FISTAEdoardo Pasca2017-10-111-0/+179
| * | | bugfixEdoardo Pasca2017-10-111-2/+2
| * | | initial revision for testingEdoardo Pasca2017-10-111-0/+354
| * | | export/import data from hdf5Edoardo Pasca2017-10-112-0/+63
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 16:10:52 +0000