diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2017-10-11 16:04:49 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2017-10-11 16:04:49 +0100 |
| commit | ad260ad1ab2e44c8c6d3daa9fe9d24c55bf5f280 (patch) | |
| tree | d417fb4780b142adb817d53cc0903e51ca70ee12 /main_func | |
| parent | 5c978b706192bc5885c7e5001a4bc4626f63d29f (diff) | |
| parent | f7e1cf04f791898737bc15b0eb437abc2c5d9305 (diff) | |
| download | regularization-ad260ad1ab2e44c8c6d3daa9fe9d24c55bf5f280.tar.gz regularization-ad260ad1ab2e44c8c6d3daa9fe9d24c55bf5f280.tar.bz2 regularization-ad260ad1ab2e44c8c6d3daa9fe9d24c55bf5f280.tar.xz regularization-ad260ad1ab2e44c8c6d3daa9fe9d24c55bf5f280.zip | |
Merge branch 'pythonize' of 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
Diffstat (limited to 'main_func')
| -rw-r--r-- | main_func/regularizers_CPU/FGP_TV_core.h | 2 | ||||
| -rw-r--r-- | main_func/regularizers_CPU/LLT_model.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/main_func/regularizers_CPU/FGP_TV_core.h b/main_func/regularizers_CPU/FGP_TV_core.h index 7e7229a..6430bf2 100644 --- a/main_func/regularizers_CPU/FGP_TV_core.h +++ b/main_func/regularizers_CPU/FGP_TV_core.h @@ -68,4 +68,4 @@ float Rupd_func3D(float *P1, float *P1_old, float *P2, float *P2_old, float *P3, float Obj_func_CALC3D(float *A, float *D, float *funcvalA, float lambda, int dimX, int dimY, int dimZ); #ifdef __cplusplus } -#endif +#endif
\ No newline at end of file diff --git a/main_func/regularizers_CPU/LLT_model.c b/main_func/regularizers_CPU/LLT_model.c index 0050654..0b07b47 100644 --- a/main_func/regularizers_CPU/LLT_model.c +++ b/main_func/regularizers_CPU/LLT_model.c @@ -24,13 +24,7 @@ limitations under the License. /* C-OMP implementation of Lysaker, Lundervold and Tai (LLT) model of higher order regularization penalty * * Input Parameters: -* 1. U0 - origanal noise image/volume -======= -/* C-OMP implementation of Lysaker, Lundervold and Tai (LLT) model of higher order regularization penalty -* -* Input Parameters: * 1. U0 - original noise image/volume ->>>>>>> fix typo and add include "matrix.h" * 2. lambda - regularization parameter * 3. tau - time-step for explicit scheme * 4. iter - iterations number |