diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-11-18 11:26:49 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-11-18 11:26:49 +0100 |
| commit | e48d0a53730bb7faa2463a64db0989ba341e12b8 (patch) | |
| tree | 62e06641aea8741a2397b73aa1b1cf175835809e /src/CudaReconstructionAlgorithm2D.cpp | |
| parent | c39b12fc42a7254bad1e68cbdb948eee0421ad81 (diff) | |
| parent | d4d7ae8c560e5511b6453ef8eca220677b504169 (diff) | |
| download | astra-e48d0a53730bb7faa2463a64db0989ba341e12b8.tar.gz astra-e48d0a53730bb7faa2463a64db0989ba341e12b8.tar.bz2 astra-e48d0a53730bb7faa2463a64db0989ba341e12b8.tar.xz astra-e48d0a53730bb7faa2463a64db0989ba341e12b8.zip | |
Merge branch 'master' into volgeom3d
Diffstat (limited to 'src/CudaReconstructionAlgorithm2D.cpp')
| -rw-r--r-- | src/CudaReconstructionAlgorithm2D.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/CudaReconstructionAlgorithm2D.cpp b/src/CudaReconstructionAlgorithm2D.cpp index 71b6637..18627fc 100644 --- a/src/CudaReconstructionAlgorithm2D.cpp +++ b/src/CudaReconstructionAlgorithm2D.cpp @@ -462,10 +462,18 @@ void CCudaReconstructionAlgorithm2D::run(int _iNrIterations) ASTRA_ASSERT(ok); - if (m_bUseMinConstraint) - ok &= m_pAlgo->setMinConstraint(m_fMinValue); - if (m_bUseMaxConstraint) - ok &= m_pAlgo->setMaxConstraint(m_fMaxValue); + if (m_bUseMinConstraint) { + bool ret = m_pAlgo->setMinConstraint(m_fMinValue); + if (!ret) { + ASTRA_WARN("This algorithm ignores MinConstraint"); + } + } + if (m_bUseMaxConstraint) { + bool ret= m_pAlgo->setMaxConstraint(m_fMaxValue); + if (!ret) { + ASTRA_WARN("This algorithm ignores MaxConstraint"); + } + } ok &= m_pAlgo->iterate(_iNrIterations); ASTRA_ASSERT(ok); |