summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replaced BaseFunction by FunctionJakob Jorgensen2018-04-112-11/+11
|
* Updated READMEJakob Jorgensen2018-04-101-4/+6
|
* Replaces .fun in funcs by .__call__Jakob Jorgensen2018-04-102-7/+7
|
* First opti docJakob Jorgensen2018-04-091-3/+45
|
* initial work on docsEdoardo Pasca2018-04-051-0/+48
|
* removed unused recipe (#89)Edoardo Pasca2018-04-043-46/+0
|
* updated licenseEdoardo Pasca2018-04-041-13/+3
|
* Rename (#88)Edoardo Pasca2018-04-048-946/+21
| | | | | | | | | | | | | | | | | | | | * create optimisation package * renamed to framework * added FiniteDiff2D operator * fixed dependencies * fix import packages * added ccpiops.py and move processors.py * updated imports * renamed but not split * Removed reconstruction as moved to optimisation
* Move astra (#85)Edoardo Pasca2018-03-287-608/+20
| | | | | | | | | | | | * removed astra stuff * removed astra and added dependency on ccpi-reconstruction * removed astra test * renamed to ccpi-framework * little changes to demo
* Simple demo ip (#79)jakobsj2018-03-225-540/+107
| | | | | | | | | | * Removed regularizers * DemoIP running. MC Lipschitz incorrect * Fixed MC Lipschitz * Removed old import
* Merge pull request #82 from vais-ral/demo_diamondjakobsj2018-03-223-12/+203
|\ | | | | Demo diamond
| * bugfix: use get_acquisition_dataEdoardo Pasca2018-03-221-15/+3
| |
| * reasonable long runEdoardo Pasca2018-03-211-72/+67
| |
| * initial revisionEdoardo Pasca2018-03-211-0/+198
| |
| * bugfix, cor undefinedEdoardo Pasca2018-03-211-1/+1
| |
| * fix and begin to change to lower_caseEdoardo Pasca2018-03-211-11/+21
| |
* | Working 2D sophiabeads demo ASTRA (#81)jakobsj2018-03-213-3/+68
|/
* Ccpi forward backprojector (#77)Edoardo Pasca2018-03-217-91/+1183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added simple test for SinogramData * initial version of processors This contains a version of a simple normalization algorithm. * added default pixel size = 1 (mm) * Added FindCenter of rotation for parallel beam geometry closes #5 * WIP for ccpi forward/backprojectors * WIP * Added Forward and Backprojectors from ccpi added processor to pad acquisition data to center on center of rotation. requires update of ccpi-reconstruction. * Added simple_demo_ccpi.py Currently there is a problem with the order of the axis after a projection/backprojection with the ccpi operator. In the calculation of the PowerMethod there is a wrong order of the axis. Possibly the creation of the data should be handled by the operator. * fixed calculation of power method * further work * fixed the x_init for the FISTA example * fixed ccpi FISTA demo * Fix missing subset call for display * Added create_image_data method to AstraOperatorSimple * Stack direction 0, not 2, in TV * Added finite different forward processor * wip * add io to setup.py * wip * comment out FiniteDifferentiator * uniformed algorithm interface Added some docstring. Added parsing of opt. * removed ccpi.io * little changes * fix setupCCPiGeometries * added simple astra demo * use minimal size for example
* add io to setup.py (#80)Edoardo Pasca2018-03-211-1/+1
|
* Merge pull request #74 from vais-ral/iojakobsj2018-03-163-0/+444
|\ | | | | Io
| * Readers return AcquisitionData along with GeometrySrikanth Nagella2018-03-161-12/+3
| |
| * Diamond and Xtek ReadersSrikanth Nagella2018-03-163-0/+453
| |
* | Renaming astra (#65)Edoardo Pasca2018-03-152-16/+16
| | | | | | | | | | | | * added test at conda build * use lower_case in geometry methods
* | Merge pull request #64 from vais-ral/tiny_geoms_fixjakobsj2018-03-141-1/+0
|\ \ | | | | | | Remove call to geoms
| * | Remove call to geomsJakob Jorgensen2018-03-141-1/+0
|/ /
* | added test at conda build (#63)Edoardo Pasca2018-03-141-0/+167
| | | | | | | | closes #37 But new tests must be added
* | use lower_case in methods (#62)Edoardo Pasca2018-03-142-17/+19
|/
* Merge pull request #61 from vais-ral/rename_as_ccppetmrjakobsj2018-03-148-236/+182
|\ | | | | Rename as ccppetmr
| * changed namingEdoardo Pasca2018-03-142-9/+5
| |
| * use lower_case and new namingEdoardo Pasca2018-03-141-29/+30
| |
| * Merge remote-tracking branch 'origin' into rename_as_ccppetmrEdoardo Pasca2018-03-143-578/+505
| |\ | |/ |/|
* | Merge tv demo (#60)jakobsj2018-03-143-581/+504
| | | | | | | | | | | | | | | | * Moved geometries into framework and removed all references to geoms. * Merged TV demo into simple_demo * Common colormap disply recons
| * Merge remote-tracking branch 'origin' into rename_as_ccppetmrEdoardo Pasca2018-03-146-653/+592
| |\ | |/ |/|
* | Moved geometries into framework and removed all references to geoms. (#57)jakobsj2018-03-146-595/+588
| | | | | | | | | | | | * Moved geometries into framework and removed all references to geoms. * New geometry names
| * renaming according to CCPPETMR conventionsEdoardo Pasca2018-03-146-140/+139
| | | | | | | | | | | | | | | | | | | | Renamed VolumeData to ImageData Renamed SinogramData to AcquisitionData NOT renamed DataSetProcessor methods are now lower_case not camelCase Moved astra_processor to package astra Updated the demos
| * moved astra_opsEdoardo Pasca2018-03-141-11/+11
|/
* Add CGLS algorithm (#52)jakobsj2018-03-143-2/+106
| | | | | | | | | | | | | | | * Added modular CGLS alg and use it in simple_demo * CGLS demo plot titles #51 * Increase num CGLS iters * CGLS: Added copy of b to r and x_init to x * Added clone method to DataSet Use clone in CGLS Added many plots to demo
* Merge pull request #50 from vais-ral/fbpd_small_fixjakobsj2018-03-082-1/+1
|\ | | | | Import also FBPD from algs, move tv demo to wip
| * Import also FBPD from algs, move tv demo to wipJakob Jorgensen2018-03-082-1/+1
|/
* Implementation of FBPD algorithm and TV regularizer func (#49)jakobsj2018-03-085-11/+188
| | | | | | | | | | | | * Added FBPD alg for LS+1norm in simple_demo * Replaced dir_op/adj_op by operator in func * WIP: implement finite diff op * FBPD TV working: TV and Norm2 funcs, FiniteDiff2D op #46 * Remove unnecessary FISTA call #46
* Merge pull request #47 from vais-ral/dataset_for_multichanneljakobsj2018-03-0810-111/+501
|\ | | | | Dataset for multichannel
| * fix of sinogram axis labelEdoardo Pasca2018-03-081-2/+2
| |
| * Merge branch 'master' of ↵Edoardo Pasca2018-03-081-4/+14
| |\ | |/ |/| | | https://github.com/vais-ral/CCPi-ReconstructionFramework into dataset_for_multichannel
* | fix simple_demo for cpu fanbeam (#44)jakobsj2018-03-072-5/+15
| |
* | New datasetprocessors (#41)Edoardo Pasca2018-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * added simple test for SinogramData * initial version of processors This contains a version of a simple normalization algorithm. * added default pixel size = 1 (mm) * Added FindCenter of rotation for parallel beam geometry closes #5
| * cleaned importsEdoardo Pasca2018-03-082-21/+13
| |
| * Simple Demo uses the updated VolumeData and SinogramDataEdoardo Pasca2018-03-081-5/+4
| |
| * Multichannel projectors inherit from single channel onesEdoardo Pasca2018-03-081-111/+29
| |
| * SinogramData and VolumeData use geometry for initializationEdoardo Pasca2018-03-081-52/+148
| | | | | | | | | | | | One can now pass the sinogram geometry or volume geometry to initialize the SinogramData or VolumeData. It handles multichannel data.
| * Multichannel processor works with SinogramData and VolumeDataEdoardo Pasca2018-03-081-16/+20
| | | | | | | | | | Internally the processor allocates the memory for sinograms and volume data, passing SinogramGeometry and VolumeGeometry to SinogramData and VolumeData.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 15:37:59 +0000