Merge branch 'master' into lm-190323-release-candidate

VirtualPhotonics · Apr 2, 2019 · af53da8 · af53da8
2 parents 4bd7cf6 + 2481087
commit af53da8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/matlab/post_processing/monte_carlo/simulation_result_loading/load_results_script.m b/matlab/post_processing/monte_carlo/simulation_result_loading/load_results_script.m
@@ -118,7 +118,7 @@
     end
 
     if isfield(results{di}, 'ROfFx') && show.ROfFx
-        figname = sprintf('log(%s)',results{di}.ROfFx.Name); figure; plot(results{di}.ROfFx.Fx_Midpoints, abs(results{di}.ROfFx.Mean)); title(figname); set(gcf,'Name', figname); 
+        figname = sprintf('%s',results{di}.ROfFx.Name); figure; plot(results{di}.ROfFx.Fx_Midpoints, abs(results{di}.ROfFx.Mean)); title(figname); set(gcf,'Name', figname); 
         xlabel('f_x [/mm]'); ylabel('R(f_x) [unitless]');
         disp(['Total reflectance captured by ROfFx detector: ' num2str(results{di}.ROfFx.Amplitude(1))]);
     end

diff --git a/src/Vts/Modeling/ForwardSolvers/TwoLayerSDAForwardSolver.cs b/src/Vts/Modeling/ForwardSolvers/TwoLayerSDAForwardSolver.cs
@@ -281,11 +281,14 @@ public override IEnumerable<double> FluenceOfRhoAndZ(
             IEnumerable<double> rhos,
             IEnumerable<double> zs)
         {
-
             foreach (var region in regions)
             {
                 var dp = GetDiffusionParameters(region);
                 var layerThicknesses = GetLayerThicknesses(region);
+                if (dp[0].zp > layerThicknesses[0])
+                {
+                    throw new ArgumentException("Top layer thickness must be greater than l* = 1/(mua+musp)");
+                }
                 foreach (var rho in rhos)
                 {
                     foreach (var z in zs)
@@ -436,6 +439,10 @@ public override IEnumerable<Complex> FluenceOfRhoAndZAndFt(
             {
                 var dps  = GetDiffusionParameters(region);
                 var layerThicknesses = GetLayerThicknesses(region);
+                if (dps[0].zp > layerThicknesses[0])
+                {
+                    throw new ArgumentException("Top layer thickness must be greater than l* = 1/(mua+musp)");
+                }
                 foreach (var rho in rhos)
                 {
                     foreach (var z in zs)