Skip to content

Implement adding Hessian diagonal in SIRF #1370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evgueni-ovtchinnikov wants to merge 9 commits into
base: master
Choose a base branch
from
+13 −6
Open

Implement adding Hessian diagonal in SIRF #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d95c7bb
updated files for release 3.9.0 [ci skip]
evgueni-ovtchinnikov Oct 28, 2025
54505e7
Merge branch 'master' of https://github.com/SyneRBI/SIRF
evgueni-ovtchinnikov Oct 30, 2025
dedf83c
Merged branch 'master' of https://github.com/SyneRBI/SIRF
evgueni-ovtchinnikov Nov 8, 2025
17867e4
Merge branch 'master' of https://github.com/SyneRBI/SIRF
evgueni-ovtchinnikov Jan 15, 2026
5a1e82f
Merge branch 'master' of https://github.com/SyneRBI/SIRF
evgueni-ovtchinnikov Jan 27, 2026
0980bdd
started working on adding Hessian diagonal in SIRF
evgueni-ovtchinnikov Jan 28, 2026
ae578b8
added constructor for xSTIR RDP from Gibbs RDP
evgueni-ovtchinnikov Jan 28, 2026
c9ee3cc
trying Kris' suggestion to derive SIRF RDP from STIR Gibbs penalty
evgueni-ovtchinnikov Feb 2, 2026
b67e1b0
replaced STIR RDP with SIRF RDP derived from Gibbs penalty
evgueni-ovtchinnikov Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/xSTIR/cSTIR/cstir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ void* cSTIR_newObject(const char* name)
if (sirf::iequals(name, "LogcoshPrior"))
return NEW_OBJECT_HANDLE(LogPrior3DF);
if (sirf::iequals(name, "RelativeDifferencePrior"))
return NEW_OBJECT_HANDLE(RDPrior3DF);
return NEW_OBJECT_HANDLE(xSTIR_RelativeDifferencePrior3DF);
//return NEW_OBJECT_HANDLE(RDPrior3DF);
#ifdef STIR_WITH_CUDA
if (sirf::iequals(name, "CudaRelativeDifferencePrior"))
return NEW_OBJECT_HANDLE(CudaRDPrior3DF);
Expand Down
11 changes: 7 additions & 4 deletions src/xSTIR/cSTIR/cstir_p.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,10 +707,12 @@ void*
sirf::cSTIR_setRelativeDifferencePriorParameter
(DataHandle* hp, const char* name, const DataHandle* hv)
{
auto& prior = objectFromHandle<stir::RelativeDifferencePrior<float>>(hp);
//auto& prior = objectFromHandle<stir::RelativeDifferencePrior<float>>(hp);
auto& prior = objectFromHandle<xSTIR_RelativeDifferencePrior3DF>(hp);
if (sirf::iequals(name, "only_2D")) {
auto& xrdp = objectFromHandle<xSTIR_RelativeDifferencePrior3DF>(hp);
xrdp.only2D(dataFromHandle<int>((void*)hv));
//auto& xrdp = objectFromHandle<xSTIR_RelativeDifferencePrior3DF>(hp);
//xrdp.only2D(dataFromHandle<int>((void*)hv));
prior.only2D(dataFromHandle<int>((void*)hv));
}
else if (sirf::iequals(name, "kappa")) {
auto& id = objectFromHandle<STIRImageData>(hv);
Expand All @@ -729,7 +731,8 @@ void*
sirf::cSTIR_RelativeDifferencePriorParameter
(DataHandle* hp, const char* name)
{
auto& prior = objectFromHandle<stir::RelativeDifferencePrior<float>>(hp);
//auto& prior = objectFromHandle<stir::RelativeDifferencePrior<float>>(hp);
auto& prior = objectFromHandle<xSTIR_RelativeDifferencePrior3DF>(hp);
if (sirf::iequals(name, "kappa")) {
auto sptr_im = std::make_shared<STIRImageData>(*prior.get_kappa_sptr());
return newObjectHandle(sptr_im);
Expand Down
5 changes: 4 additions & 1 deletion src/xSTIR/cSTIR/include/sirf/STIR/stir_x.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ limitations under the License.
#include "sirf/common/iequals.h"
#include "sirf/common/JacobiCG.h"
#include "sirf/STIR/stir_data_containers.h"

#include "stir/recon_buildblock/GibbsRelativeDifferencePenalty.h"
#include "stir/recon_buildblock/PoissonLogLikelihoodWithLinearModelForMeanAndProjData.h"
#include "stir/recon_buildblock/PoissonLogLikelihoodWithLinearModelForMeanAndListModeDataWithProjMatrixByBin.h"
#include "stir/GeneralisedPoissonNoiseGenerator.h"
Expand Down Expand Up @@ -1143,7 +1145,8 @@ The actual algorithm is described in
}
};

class xSTIR_RelativeDifferencePrior3DF : public stir::RelativeDifferencePrior < float > {
class xSTIR_RelativeDifferencePrior3DF : public stir::GibbsRelativeDifferencePenalty<float> {
//class xSTIR_RelativeDifferencePrior3DF : public stir::RelativeDifferencePrior<float> {
public:
void only2D(int only) {
only_2D = only != 0;
Expand Down