Modified call to FluenceOfRhoAndZ and GetPHD to use variable allRhos (negative and positive rhos) instead of rhos (just positive rhos).

Author: hayakawa16

forward-solvers/phd-of-rho-and-z-two-layer.py

@@ -55,21 +55,23 @@
 zs = 0.1 + zs_delta * np.arange(100)
 print(zs)
 
+allRhos = np.concatenate((-rhos[::-1], rhos))
 opRegionsArray = Array[Array[IOpticalPropertyRegion]]([opRegions])
 # predict the tissue's fluence(rho, z) for the given optical properties 
-fluenceOfRhoAndZ = solver.FluenceOfRhoAndZ(opRegionsArray, rhos, zs );
+fluenceOfRhoAndZ = solver.FluenceOfRhoAndZ(opRegionsArray, allRhos, zs );
 #print("*********************************** FLUENCE *****************************************")
 #print(list(fluenceOfRhoAndZ))
 
 #PHD
+print("*********************************** Fluence *****************************************")
+print('len(fluenceOfRhoAndZ)=',len(fluenceOfRhoAndZ))
 sourceDetectorSeparation = 10
 opArray = Array.CreateInstance(OpticalProperties, 2)
 opArray[0] = OpticalProperties(0.1, 1, 0.8, 1.4)
 opArray[1] = OpticalProperties(0.01, 1, 0.8, 1.4)
 
-phdOfRhoAndZ = ComputationFactory.GetPHD(solver, fluenceOfRhoAndZ, sourceDetectorSeparation, opArray, Array[Double](rhos.tolist()), Array[Double](zs.tolist()))
+phdOfRhoAndZ = ComputationFactory.GetPHD(solver, fluenceOfRhoAndZ, sourceDetectorSeparation, opArray, Array[Double](allRhos.tolist()), Array[Double](zs.tolist()))
 
-allRhos = np.concatenate((-rhos[::-1], rhos))
 print("*********************************** RHOS *****************************************")
 print(allRhos.tolist())
 
@@ -102,4 +104,4 @@ def heatmap(values, x, y, x_label="", y_label="", title=""):
     return fig
 
 fluenceChart = heatmap(fluenceRowsToPlot.tolist(), list(rhos), list(zs), "ρ [mm]", "z [mm]", "log(phd(ρ, z) [mm-2])")
-fluenceChart.show(renderer="browser")
+fluenceChart.show(renderer="browser")