[SWIG] add PinholeSPECTUB matrix (#1336)

UCL · Jan 17, 2024 · 434837c · 434837c
1 parent 2eaacd6
commit 434837c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/documentation/release_6.0.htm b/documentation/release_6.0.htm
@@ -130,6 +130,9 @@ <h4>General</h4>
 
     <h4>Python (and MATLAB)</h4>
     <ul>
+      <li> exposed <code>ProjMatrixByBinPinholeSPECTUB</code><br>
+        <a href="https://github.com/UCL/STIR/pull/1366">PR #1366</a>
+      </li>
       <li><a href="https://github.com/UCL/STIR/pull/1288">PR #1288</a>
         <ul>
           <li>

diff --git a/src/swig/stir.i b/src/swig/stir.i
@@ -136,6 +136,7 @@
 
 #include "stir/recon_buildblock/ProjMatrixByBinUsingRayTracing.h"
 #include "stir/recon_buildblock/ProjMatrixByBinSPECTUB.h"
+#include "stir/recon_buildblock/ProjMatrixByBinPinholeSPECTUB.h"
 #include "stir/recon_buildblock/QuadraticPrior.h"
 #include "stir/recon_buildblock/PLSPrior.h"
 #include "stir/recon_buildblock/RelativeDifferencePrior.h"

diff --git a/src/swig/stir_projectors.i b/src/swig/stir_projectors.i
@@ -45,6 +45,13 @@
 	    >);
 %shared_ptr(stir::ProjMatrixByBinSPECTUB);
 
+%shared_ptr(stir::RegisteredParsingObject<
+	      stir::ProjMatrixByBinPinholeSPECTUB,
+              stir::ProjMatrixByBin,
+              stir::ProjMatrixByBin
+	    >);
+%shared_ptr(stir::ProjMatrixByBinPinholeSPECTUB);
+
 %include "stir/recon_buildblock/ForwardProjectorByBin.h"
 %include "stir/recon_buildblock/BackProjectorByBin.h"
 %include "stir/recon_buildblock/ProjMatrixByBin.h"
@@ -60,7 +67,15 @@
               stir::ProjMatrixByBin
   >;
 
-%include "stir/recon_buildblock/ProjMatrixByBinSPECTUB.h"
+%include "stir/recon_buildblock/ProjMatrixByBinPinholeSPECTUB.h"
+
+%template (internalRPProjMatrixByBinPinholeSPECTUB) stir::RegisteredParsingObject<
+	      stir::ProjMatrixByBinPinholeSPECTUB,
+              stir::ProjMatrixByBin,
+              stir::ProjMatrixByBin
+  >;
+
+%include "stir/recon_buildblock/ProjMatrixByBinPinholeSPECTUB.h"
 
 %template (internalRPForwardProjectorByBinUsingProjMatrixByBin)  
   stir::RegisteredParsingObject<stir::ForwardProjectorByBinUsingProjMatrixByBin,
@@ -72,8 +87,6 @@
      stir::BackProjectorByBin>;
 %include "stir/recon_buildblock/BackProjectorByBinUsingProjMatrixByBin.h"
 
-%include "stir/recon_buildblock/ProjMatrixByBinSPECTUB.h"
-
 %shared_ptr(stir::ProjectorByBinPair);
 // explicitly ignore constructor, because SWIG tries to instantiate the abstract class otherwise
 %ignore stir::ProjectorByBinPair::ProjectorByBinPair();