summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'demos' into update_fix_testEdoardo Pasca2019-06-1235-1284/+2101
|\
| * Merge branch 'composite_operator_datacontainer' into demosEdoardo Pasca2019-06-126-1/+843
| |\
| | * Merge pull request #308 from vais-ral/fix_io_importsEdoardo Pasca2019-06-123-6/+2
| | |\
| | | * fix imports in ioEdoardo Pasca2019-06-123-6/+2
| | |/
| | * Merge pull request #307 from vais-ral/data_readers_mergeevelinaametova2019-06-126-1/+856
| | |\
| | | * data readers, writer, resizer to composite_data_container branchEvelina Ametova2019-06-126-1/+856
| | |/
| * | Merge branch 'demos' of https://github.com/vais-ral/CCPi-Framework into demosEdoardo Pasca2019-06-121-36/+28
| |\ \
| | * \ mergeepapoutsellis2019-06-1226-224/+156
| | |\ \
| | * | | TGV tomophantomepapoutsellis2019-06-121-36/+28
| * | | | removed DS_Store filesEdoardo Pasca2019-06-123-0/+0
| | |/ / | |/| |
| * | | Merge pull request #303 from vais-ral/update_demoEdoardo Pasca2019-06-1226-224/+156
| |\ \ \ | | |/ / | |/| |
| | * | Merge remote-tracking branch 'origin/demos' into update_demoEdoardo Pasca2019-06-1226-1257/+1240
| | |\ \ | | |/ / | |/| |
| * | | delete old demos from wipepapoutsellis2019-06-127-1212/+0
| * | | delete old demosepapoutsellis2019-06-122-373/+0
| * | | tgv tomoepapoutsellis2019-06-121-31/+51
| * | | tomo 2d TVepapoutsellis2019-06-112-0/+173
| * | | mergeepapoutsellis2019-06-116-46/+436
| |\ \ \
| | * | | add 2d time demoepapoutsellis2019-06-111-14/+65
| | * | | fix tomophantom demoepapoutsellis2019-06-101-11/+6
| | * | | merge demosepapoutsellis2019-06-1020-464/+1264
| | |\ \ \
| | * | | | imat colorbay demosepapoutsellis2019-06-104-21/+365
| * | | | | tv tomo 2Depapoutsellis2019-06-112-0/+173
| | |/ / / | |/| | |
| * | | | demos with tomophantomepapoutsellis2019-06-102-0/+344
| * | | | denoising exam with cvx cmpepapoutsellis2019-06-103-5/+3
| * | | | color denoisingepapoutsellis2019-06-051-0/+115
| * | | | new phantom imageepapoutsellis2019-06-053-0/+373
| * | | | fista trialsepapoutsellis2019-06-055-79/+61
* | | | | Merge remote-tracking branch 'origin/fix_test' into update_fix_testEdoardo Pasca2019-06-0711-50/+403
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | reinstated check of dimension_label NoneEdoardo Pasca2019-06-071-1/+1
| * | | | add memopt and some checksEdoardo Pasca2019-06-061-2/+47
| * | | | add printsEdoardo Pasca2019-06-061-23/+15
| * | | | add callbackEdoardo Pasca2019-06-062-18/+41
| * | | | fixed testEdoardo Pasca2019-06-054-19/+35
| * | | | added example fileEdoardo Pasca2019-06-041-0/+133
| * | | | progressEdoardo Pasca2019-06-047-12/+149
| * | | | fixing testsEdoardo Pasca2019-06-045-98/+59
* | | | | Merge pull request #305 from vais-ral/config_algEdoardo Pasca2019-06-079-95/+25
|\ \ \ \ \
| * | | | | removed FBPDEdoardo Pasca2019-06-073-85/+0
| * | | | | added bool configured to AlgorithmEdoardo Pasca2019-06-077-32/+47
|/ / / / /
* | | | | Merge branch 'composite_operator_datacontainer' into update_demoEdoardo Pasca2019-06-0720-129/+131
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Merge norm ref (#301)Edoardo Pasca2019-06-0714-98/+33
| * | | Norm refactor (#299)Edoardo Pasca2019-06-069-12/+36
| |/ /
| * | Merge pull request #291 from vais-ral/norm2sq_bugfixEdoardo Pasca2019-06-044-11/+11
| |\ \
| | * \ Merge branch 'norm2sq_bugfix' into composite_operator_datacontainerEdoardo Pasca2019-06-034-11/+11
| | |\ \
| | | * | fix import and calls in testsEdoardo Pasca2019-06-032-8/+8
| | | * | Fix upper/lower case inconsistency to allow astra demo to runJakob Jorgensen, WS at HMXIF2019-05-212-3/+3
| * | | | Merge pull request #297 from vais-ral/algorithm_print27Edoardo Pasca2019-06-041-8/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | fix print for python27Edoardo Pasca2019-06-041-8/+7
| |/ / /
| * | | updated printEdoardo Pasca2019-05-231-6/+5
| * | | update pretty printEdoardo Pasca2019-05-231-10/+34
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 19:59:46 +0000