summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* removed wip directoryEdoardo Pasca2019-07-0235-6593/+0
* Merge pull request #332 from vais-ral/cgls_fixEdoardo Pasca2019-07-028-227/+559
|\
| * added print of reached toleranceEdoardo Pasca2019-07-022-2/+5
| * removed commentsEdoardo Pasca2019-07-011-61/+2
| * calculation of flag in method, redefinition of default stop criterionEdoardo Pasca2019-07-011-15/+13
| * use master implementationEdoardo Pasca2019-07-011-2/+0
| * Merge branch 'master' into cgls_fixEdoardo Pasca2019-07-011-5/+18
| |\
| * | fix cglsepapoutsellis2019-06-263-29/+26
| * | fix cglsepapoutsellis2019-06-262-46/+56
| * | fix cgls impleepapoutsellis2019-06-267-164/+486
| * | cgls_testepapoutsellis2019-06-252-73/+136
* | | added install instructionsEdoardo Pasca2019-07-011-8/+15
| |/ |/|
* | Merge pull request #338 from vais-ral/verbose_outputEdoardo Pasca2019-07-011-5/+18
|\ \ | |/ |/|
| * removed or from ifEdoardo Pasca2019-07-011-2/+1
| * correct verbose outputEdoardo Pasca2019-07-011-5/+19
|/
* Merge pull request #330 from vais-ral/demo_data_filesgfardell2019-06-243-12/+107
|\
| * Unit tests on test image loading and image sizeGemma Fardell2019-06-241-38/+69
| * bug fix on generating test dataGemma Fardell2019-06-241-3/+3
| * Added unittests for test dataGemma Fardell2019-06-211-7/+71
| * Merge branch 'master' into demo_data_filesGemma Fardell2019-06-214-49/+420
| |\
| * | added shapes.png to setup.pyGemma Fardell2019-06-211-1/+1
| * | added shapes.png to setup.pyGemma Fardell2019-06-211-1/+1
* | | Merge pull request #331 from vais-ral/numpy_versionsEdoardo Pasca2019-06-241-0/+2
|\ \ \ | |_|/ |/| |
| * | Update conda_build_config.yamlEdoardo Pasca2019-06-241-0/+2
|/ /
* | Merge pull request #329 from vais-ral/random_noise_functionEdoardo Pasca2019-06-214-51/+294
|\ \
| * | added testclass file to hold the CCPiTestClass definitionsEdoardo Pasca2019-06-211-0/+41
| * | makes sure write tests happen before read testsEdoardo Pasca2019-06-211-2/+5
| * | fix local import for python 2.7Edoardo Pasca2019-06-211-3/+4
| * | temporarily renamed test_NexusReaderWriter.pyEdoardo Pasca2019-06-211-0/+0
| * | added initial test for random_noiseEdoardo Pasca2019-06-211-0/+18
| * | added commentEdoardo Pasca2019-06-211-0/+1
| * | added random_noise to TestData as staticmethodEdoardo Pasca2019-06-201-3/+9
| * | add random_noise to TestDataEdoardo Pasca2019-06-201-48/+221
|/ /
* | Merge pull request #322 from vais-ral/composite_operator_datacontainerevelinaametova2019-06-191-0/+128
|\ \ | |/ |/|
| * unittest for nexus data reader and writerEvelina Ametova2019-06-191-0/+128
* | create Readme.txtEdoardo Pasca2019-06-141-0/+3
* | Merge pull request #207 from vais-ral/composite_operator_datacontainerEdoardo Pasca2019-06-14131-2067/+17893
|\|
| * Merge pull request #316 from vais-ral/add_nexusEdoardo Pasca2019-06-141-0/+0
| |\
| | * Add nexus data modified for new readerJakob Jorgensen, WS at HMXIF2019-06-141-0/+0
| * | renamed the simple jakobs phantom to hotdogEdoardo Pasca2019-06-141-1/+1
| |/
| * update readmeEdoardo Pasca2019-06-131-3/+5
| * Merge pull request #254 from vais-ral/demosEdoardo Pasca2019-06-13113-3604/+9827
| |\
| | * add numpy numerical types to allowed types for inline algebraEdoardo Pasca2019-06-132-2/+7
| | * Merge origin/composite_operator_datacontainer into demosEdoardo Pasca2019-06-133-18/+48
| | |\ | | |/ | |/|
| * | Merge pull request #309 from vais-ral/dot_fixEdoardo Pasca2019-06-131-2/+2
| |\ \
| | * | replace default for dot by numpyJakob Jorgensen, WS at HMXIF2019-06-121-2/+2
| * | | Merge pull request #315 from vais-ral/evelinaametova-patch-1evelinaametova2019-06-131-4/+2
| |\ \ \
| | * | | Update NEXUSDataReader.pyevelinaametova2019-06-131-4/+2
| |/ / /
| * | | Merge pull request #314 from vais-ral/data_readers_fixevelinaametova2019-06-133-14/+47
| |\ \ \ | | |/ / | |/| |
| | * | fix None values in Reader/ WrirerEvelina Ametova2019-06-133-14/+47
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 03:28:58 +0000