Merge pull request #1345 from SyneRBI/fix-prior-arg-order

Fixes order of arguments for some Hessian methods for priors

Author: KrisThielemans

src/xSTIR/cSTIR/cstir.cpp

@@ -1381,7 +1381,7 @@ cSTIR_priorGradient(void* ptr_p, void* ptr_i)
 
 extern "C"
 void*
-cSTIR_priorAccumulateHessianTimesInput(void* ptr_prior, void* ptr_out, void* ptr_cur, void* ptr_inp)
+cSTIR_priorAccumulateHessianTimesInput(void* ptr_prior, void* ptr_cur, void* ptr_inp, void* ptr_out)
 {
 	try {
 		auto& prior = objectFromHandle<stir::GeneralisedPrior <Image3DF> >(ptr_prior);
@@ -1399,7 +1399,7 @@ cSTIR_priorAccumulateHessianTimesInput(void* ptr_prior, void* ptr_out, void* ptr
 
 extern "C"
 void*
-cSTIR_priorComputeHessianTimesInput(void* ptr_prior, void* ptr_out, void* ptr_cur, void* ptr_inp)
+cSTIR_priorComputeHessianTimesInput(void* ptr_prior, void* ptr_cur, void* ptr_inp, void* ptr_out)
 {
 	try {
 		auto& prior = objectFromHandle<xSTIR_GeneralisedPrior3DF>(ptr_prior);

src/xSTIR/pSTIR/STIR.py

@@ -2448,7 +2448,7 @@ def accumulate_Hessian_times_input(self, current_estimate, input_, out=None):
         if out is None or out.handle is None:
             out = input_.get_uniform_copy(0.0)
         try_calling(pystir.cSTIR_priorAccumulateHessianTimesInput
-            (self.handle, out.handle, current_estimate.handle, input_.handle))
+            (self.handle, current_estimate.handle, input_.handle, out.handle))
         return out
 
     def multiply_with_Hessian(self, current_estimate, input_, out=None):

src/xSTIR/pSTIR/tests/tests_qp_lc_rdp.py

@@ -50,6 +50,8 @@ def Hessian_test(test, prior, x, eps=1e-3):
     #print('norm of grad(x + dx) - grad(x): %f' % dg.norm())
     #print('norm of H(x)*dx: %f' % Hdx.norm())
     #print('relative difference: %g' % q)
+    if dg.norm() == 0:
+        q = 0
     test.check_if_less(q, .01*eps)
 
 

src/xSTIR/pSTIR/tests/tests_qp_lc_rdp.txt

@@ -1,12 +1,12 @@
-470837.34375
-35069.37890625
-5913.474609375
-566.474609375
-103.76306915283203
-37.39760208129883
-1883349.375
-140277.515625
-23653.8984375
-2265.8984375
-415.0522766113281
-149.5904083251953
+1.372872e+07
+1.135939e+06
+2.176679e+05
+1.787231e+04
+1.730207e+03
+6.195086e+02
+5.491489e+07
+4.543754e+06
+8.706718e+05
+7.148926e+04
+6.920829e+03
+2.478034e+03