summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Finds the active conda environmentEdoardo Pasca2017-10-231-4/+56
| | | | sets up for the current active conda environmnet
* Added setup.py.inEdoardo Pasca2017-10-231-0/+67
|
* Add needed environment variablesEdoardo Pasca2017-10-233-6/+30
| | | | Adds the environment variables that are needed to compile via conda.
* Merge branch origin/pythonize into pythonizeEdoardo Pasca2017-10-202-169/+143
|\
| * Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-2013-309/+601
| |\ | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| * | 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 ↵Edoardo Pasca2017-10-202-1/+2
|\ \ | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+79
| | | | | | | | | | | | attempting to locate conda python environment
| * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+4
| | | | | | | | | | | | attempt to use CMake to create the build environment
* | | Initial revision of build environment made with CMakeEdoardo Pasca2017-10-209-0/+336
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial revision of build environment made with CMake First commit of CMakeLists.txt attempt to use CMake to create the build environment First commit of CMakeLists.txt attempting to locate conda python environment Added a few files for CMake Many changes for the CMake compilation. Tested CMake build Bugfixes
* | 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-else
| | * | moved code out of if-then-elseEdoardo Pasca2017-10-191-39/+15
| |/ / | | | | | | | | | fixed #5
* | | Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-193-89/+594
|\ \ \ | | |/ | |/| | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| * | 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
| | | | | | | | | | | | added RSME
| * | Modified Region of interest; removed studenttEdoardo Pasca2017-10-181-14/+7
| | | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction/commit/6fb8f5d188ed31d7a7077cba8ab7aea17b25b8bf
* | | moved code out of if-the-elseEdoardo Pasca2017-10-191-39/+15
| | | | | | | | | | | | closes issue #5
* | | 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 ↵Edoardo Pasca2017-10-184-265/+179
|\| | | |/ |/| | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| * linked demos to TomoPhantom, cone beam demo, some FISTA modificastionsDaniil Kazantsev2017-10-184-265/+179
| |
* | Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-181-0/+0
|\ \ | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| * | 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 data in hdf5 format removed hdf5 data
* | Added many methodsEdoardo Pasca2017-10-171-24/+160
| |
* | Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-1323-285/+1582
|\ \ | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| * \ Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-1110-58/+990
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | 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
| | | | | | | | | | | | | | | | | | | | 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.
| * | | module renameEdoardo Pasca2017-10-111-2/+2
| | | |
| * | | initial revisionEdoardo Pasca2017-10-111-0/+322
| | | |
| * | | added viewer for testingEdoardo Pasca2017-10-1111-0/+1987
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 15:25:49 +0000