Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | use master implementation | Edoardo Pasca | 2019-07-01 | 1 | -2/+0 | |
| * | Merge branch 'master' into cgls_fix | Edoardo Pasca | 2019-07-01 | 1 | -5/+18 | |
| |\ | ||||||
| * | | fix cgls | epapoutsellis | 2019-06-26 | 3 | -29/+26 | |
| * | | fix cgls | epapoutsellis | 2019-06-26 | 2 | -46/+56 | |
| * | | fix cgls imple | epapoutsellis | 2019-06-26 | 7 | -164/+486 | |
| * | | cgls_test | epapoutsellis | 2019-06-25 | 2 | -73/+136 | |
* | | | added install instructions | Edoardo Pasca | 2019-07-01 | 1 | -8/+15 | |
| |/ |/| | ||||||
* | | Merge pull request #338 from vais-ral/verbose_output | Edoardo Pasca | 2019-07-01 | 1 | -5/+18 | |
|\ \ | |/ |/| | ||||||
| * | removed or from if | Edoardo Pasca | 2019-07-01 | 1 | -2/+1 | |
| * | correct verbose output | Edoardo Pasca | 2019-07-01 | 1 | -5/+19 | |
|/ | ||||||
* | Merge pull request #330 from vais-ral/demo_data_files | gfardell | 2019-06-24 | 3 | -12/+107 | |
|\ | ||||||
| * | Unit tests on test image loading and image size | Gemma Fardell | 2019-06-24 | 1 | -38/+69 | |
| * | bug fix on generating test data | Gemma Fardell | 2019-06-24 | 1 | -3/+3 | |
| * | Added unittests for test data | Gemma Fardell | 2019-06-21 | 1 | -7/+71 | |
| * | Merge branch 'master' into demo_data_files | Gemma Fardell | 2019-06-21 | 4 | -49/+420 | |
| |\ | ||||||
| * | | added shapes.png to setup.py | Gemma Fardell | 2019-06-21 | 1 | -1/+1 | |
| * | | added shapes.png to setup.py | Gemma Fardell | 2019-06-21 | 1 | -1/+1 | |
* | | | Merge pull request #331 from vais-ral/numpy_versions | Edoardo Pasca | 2019-06-24 | 1 | -0/+2 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Update conda_build_config.yaml | Edoardo Pasca | 2019-06-24 | 1 | -0/+2 | |
|/ / | ||||||
* | | Merge pull request #329 from vais-ral/random_noise_function | Edoardo Pasca | 2019-06-21 | 4 | -51/+294 | |
|\ \ | ||||||
| * | | added testclass file to hold the CCPiTestClass definitions | Edoardo Pasca | 2019-06-21 | 1 | -0/+41 | |
| * | | makes sure write tests happen before read tests | Edoardo Pasca | 2019-06-21 | 1 | -2/+5 | |
| * | | fix local import for python 2.7 | Edoardo Pasca | 2019-06-21 | 1 | -3/+4 | |
| * | | temporarily renamed test_NexusReaderWriter.py | Edoardo Pasca | 2019-06-21 | 1 | -0/+0 | |
| * | | added initial test for random_noise | Edoardo Pasca | 2019-06-21 | 1 | -0/+18 | |
| * | | added comment | Edoardo Pasca | 2019-06-21 | 1 | -0/+1 | |
| * | | added random_noise to TestData as staticmethod | Edoardo Pasca | 2019-06-20 | 1 | -3/+9 | |
| * | | add random_noise to TestData | Edoardo Pasca | 2019-06-20 | 1 | -48/+221 | |
|/ / | ||||||
* | | Merge pull request #322 from vais-ral/composite_operator_datacontainer | evelinaametova | 2019-06-19 | 1 | -0/+128 | |
|\ \ | |/ |/| | ||||||
| * | unittest for nexus data reader and writer | Evelina Ametova | 2019-06-19 | 1 | -0/+128 | |
* | | create Readme.txt | Edoardo Pasca | 2019-06-14 | 1 | -0/+3 | |
* | | Merge pull request #207 from vais-ral/composite_operator_datacontainer | Edoardo Pasca | 2019-06-14 | 131 | -2067/+17893 | |
|\| | ||||||
| * | Merge pull request #316 from vais-ral/add_nexus | Edoardo Pasca | 2019-06-14 | 1 | -0/+0 | |
| |\ | ||||||
| | * | Add nexus data modified for new reader | Jakob Jorgensen, WS at HMXIF | 2019-06-14 | 1 | -0/+0 | |
| * | | renamed the simple jakobs phantom to hotdog | Edoardo Pasca | 2019-06-14 | 1 | -1/+1 | |
| |/ | ||||||
| * | update readme | Edoardo Pasca | 2019-06-13 | 1 | -3/+5 | |
| * | Merge pull request #254 from vais-ral/demos | Edoardo Pasca | 2019-06-13 | 113 | -3604/+9827 | |
| |\ | ||||||
| | * | add numpy numerical types to allowed types for inline algebra | Edoardo Pasca | 2019-06-13 | 2 | -2/+7 | |
| | * | Merge origin/composite_operator_datacontainer into demos | Edoardo Pasca | 2019-06-13 | 3 | -18/+48 | |
| | |\ | | |/ | |/| | ||||||
| * | | Merge pull request #309 from vais-ral/dot_fix | Edoardo Pasca | 2019-06-13 | 1 | -2/+2 | |
| |\ \ | ||||||
| | * | | replace default for dot by numpy | Jakob Jorgensen, WS at HMXIF | 2019-06-12 | 1 | -2/+2 | |
| * | | | Merge pull request #315 from vais-ral/evelinaametova-patch-1 | evelinaametova | 2019-06-13 | 1 | -4/+2 | |
| |\ \ \ | ||||||
| | * | | | Update NEXUSDataReader.py | evelinaametova | 2019-06-13 | 1 | -4/+2 | |
| |/ / / | ||||||
| * | | | Merge pull request #314 from vais-ral/data_readers_fix | evelinaametova | 2019-06-13 | 3 | -14/+47 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | fix None values in Reader/ Wrirer | Evelina Ametova | 2019-06-13 | 3 | -14/+47 | |
| |/ / | ||||||
| | * | Merge pull request #313 from vais-ral/update_fix_test | Edoardo Pasca | 2019-06-13 | 11 | -82/+450 | |
| | |\ | ||||||
| | | * | Merge remote branch 'update_fix_test' | Edoardo Pasca | 2019-06-13 | 2 | -13/+16 | |
| | | |\ | ||||||
| | | | * | fix test import | Edoardo Pasca | 2019-06-13 | 2 | -13/+16 | |
| | | * | | remove check isnan which fails with BlockDataContainers | Edoardo Pasca | 2019-06-13 | 1 | -3/+1 | |
| | | |/ | ||||||
| | | * | added test | Edoardo Pasca | 2019-06-13 | 2 | -19/+44 | |
| | | |\ |