From a56bef4e0a0a9d1023de5d8164cc4629dda1ae77 Mon Sep 17 00:00:00 2001
From: Lisa Malenfant <lisa.malenfant@uci.edu>
Date: Fri, 29 Sep 2023 11:36:51 -0700
Subject: [PATCH 1/9] Reorganized ROfRho and ROfRhoAndTime

---
 src/Vts/Interfaces/IForwardSolver.cs | 381 ++++++++++++---------------
 1 file changed, 168 insertions(+), 213 deletions(-)

diff --git a/src/Vts/Interfaces/IForwardSolver.cs b/src/Vts/Interfaces/IForwardSolver.cs
index 5aadea530..e2e20666d 100644
--- a/src/Vts/Interfaces/IForwardSolver.cs
+++ b/src/Vts/Interfaces/IForwardSolver.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Numerics;
-using Vts.MonteCarlo;
 
 namespace Vts
 {
@@ -10,10 +9,47 @@ namespace Vts
     /// </summary>
     public interface IForwardSolver : INotifyPropertyChanged
     {
-        #region IMultiRegionForwardSolver // ?
+        #region ROfRho
+        /// <summary>
+        /// Determines reflectance at source-detector separation rho
+        /// </summary>
+        /// <param name="op">optical properties of the medium</param>
+        /// <param name="rho">source-detector separation (mm)</param>
+        /// <returns>Reflectance at source-detector separation rho</returns>
+        double ROfRho(OpticalProperties op, double rho);
+
+        /// <summary>
+        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'op' and source-detector separations 'rhos'
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <returns>Reflectance as a function of rhos</returns>
+        double[] ROfRho(OpticalProperties op, double[] rhos);
+
+        /// <summary>
+        /// Overload of ROfRho. Determines reflectance at optical properties 'ops', and source-detector separation 'rho'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rho">source-detector separation (mm)</param>
+        /// <returns>Reflectance as a function of rho</returns>
+        double[] ROfRho(OpticalProperties[] ops, double rho);
+
+        /// <summary>
+        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'ops' and source-detector separations 'rhos'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <returns>Reflectance as a function of rhos</returns>
+        double[] ROfRho(OpticalProperties[] ops, double[] rhos);
+
+        /// <summary>
+        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'ops' and source-detector separations 'rhos'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <returns>Reflectance as a function of rhos</returns>
+        IEnumerable<double> ROfRho(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos);
 
-        // prototype of new interface methods for multi-region capabilities
-        #region double ROfRho(IOpticalPropertyRegion[] regions, double rho);
         /// <summary>
         /// Determines reflectance at source-detector separation rho
         /// </summary>
@@ -23,20 +59,20 @@ public interface IForwardSolver : INotifyPropertyChanged
         double ROfRho(IOpticalPropertyRegion[] regions, double rho);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions and source-detector separations 'rhos'
+        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions and source-detector separations 'rhos'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <returns>Reflectance as a function of rhos</returns>
-        IEnumerable<double> ROfRho(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos);
+        double[] ROfRho(IOpticalPropertyRegion[] regions, double[] rhos);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions and source-detector separations 'rhos'
+        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions and source-detector separations 'rhos'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <returns>Reflectance as a function of rhos</returns>
-        double[] ROfRho(IOpticalPropertyRegion[] regions, double[] rhos);
+        IEnumerable<double> ROfRho(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos);
 
         /// <summary>
         /// Overload of scalar ROfRho function. Determines reflectance given tissue regions and source-detector separations 'rhos'
@@ -47,26 +83,99 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRho(IOpticalPropertyRegion[][] regions, double[] rhos);
         #endregion
 
-        #region double ROfRhoAndTime(IOpticalPropertyRegion[] regions, double rho, double time);
+        #region ROfRhoAndTime
         /// <summary>
         /// Determines reflectance at source-detector separation rho and time
         /// </summary>
-        /// <param name="regions">optical and geometrical properties of the medium for each sub-region</param>
+        /// <param name="op">optical properties of the medium</param>
         /// <param name="rho">source-detector separation (mm)</param>
         /// <param name="time">time (ns)</param>
-        /// <returns>Reflectance at source-detector separation rho</returns>
-        double ROfRhoAndTime(IOpticalPropertyRegion[] regions, double rho, double time);
+        /// <returns>Reflectance at source-detector separation rho and time</returns>
+        double ROfRhoAndTime(OpticalProperties op, double rho, double time);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions, source-detector 
-        /// separations 'rhos', and times 'times'
+        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and times 
         /// </summary>
-        /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
+        /// <param name="op">medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="times">times (ns)</param>
         /// <returns>Reflectance as a function of rhos and times</returns>
-        IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, 
-            IEnumerable<double> times);
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double[] times);
+
+        /// <summary>
+        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'op', source-detector separation 'rho' and times 
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="rho">source-detector separation (mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of rho and times</returns>
+        double[] ROfRhoAndTime(OpticalProperties op, double rho, double[] times);
+
+        /// <summary>
+        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and time 't'
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="rhos">source-detector separation (mm)</param>
+        /// <param name="time">time (ns)</param>
+        /// <returns>Reflectance as a function of rhos and time</returns>
+        double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double time);
+
+        /// <summary>
+        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and times 't'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rho">source-detector separation (mm)</param>
+        /// <param name="time">time (ns)</param>
+        /// <returns>Reflectance as a function of rho and time</returns>
+        double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double time);
+
+        /// <summary>
+        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="time">time (ns)</param>
+        /// <returns>Reflectance as function of rhos and times</returns>
+        double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double time);
+
+        /// <summary>
+        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and times 
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rho">source-detector separation (mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of rho and time</returns>
+        double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double[] times);
+
+        /// <summary>
+        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and times 
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of rho and time</returns>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double[] times);
+
+        /// <summary>
+        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and times 
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties </param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of rhos and times</returns>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        IEnumerable<double> ROfRhoAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> times);
+
+        /// <summary>
+        /// Determines reflectance at source-detector separation rho and time
+        /// </summary>
+        /// <param name="regions">optical and geometrical properties of the medium for each sub-region</param>
+        /// <param name="rho">source-detector separation (mm)</param>
+        /// <param name="time">time (ns)</param>
+        /// <returns>Reflectance at source-detector separation rho</returns>
+        double ROfRhoAndTime(IOpticalPropertyRegion[] regions, double rho, double time);
 
         /// <summary>
         /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
@@ -107,9 +216,19 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="times">times (ns)</param>
         /// <returns>Reflectance as a function of rhos and times</returns>
         double[] ROfRhoAndTime(IOpticalPropertyRegion[][] regions, double[] rhos, double[] times);
+
+        /// <summary>
+        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions, source-detector 
+        /// separations 'rhos', and times 'times'
+        /// </summary>
+        /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of rhos and times</returns>
+        IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos,
+            IEnumerable<double> times);
         #endregion
 
-        #region Complex ROfRhoAndFt(IOpticalPropertyRegion[] regions, double rho, double ft);
         /// <summary>
         /// Determines reflectance at source-detector separation rho and temporal frequency ft
         /// </summary>
@@ -168,9 +287,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fts">temporal frequencies</param>
         /// <returns>Reflectance as a function of rhos and fts</returns>
         Complex[] ROfRhoAndFt(IOpticalPropertyRegion[][] regions, double[] rhos, double[] fts);
-        #endregion
 
-        #region double ROFx(IOpticalPropertyRegion[] regions, double fx);
+
         /// <summary>
         /// Determines reflectance at spatial frequency 
         /// </summary>
@@ -202,9 +320,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fxs">spatial frequencies</param>
         /// <returns>Reflectance at spatial frequency</returns>
         double[] ROfFx(IOpticalPropertyRegion[][] regions, double[] fxs);
-        #endregion
 
-        #region double ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double time);
+
         /// <summary>
         /// Determines reflectance at spatial frequency and time
         /// </summary>
@@ -264,9 +381,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="times">times (ns)</param>
         /// <returns>Reflectance at spatial freq. and time</returns>
         double[] ROfFxAndTime(IOpticalPropertyRegion[][] regions, double[] fxs, double[] times);
-        #endregion
 
-        #region Complex ROfFxAndFt(IOpticalPropertyRegion[] regions, double fx, double ft);
+
         /// <summary>
         /// Determines reflectance at spatial frequency fx and temporal frequency ft
         /// </summary>
@@ -325,9 +441,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fts">temporal frequencies</param>
         /// <returns>Reflectance at spatial freq. and temporal freq.</returns>
         Complex[] ROfFxAndFt(IOpticalPropertyRegion[][] regions, double[] fxs, double[] fts);
-        #endregion
 
-        #region double[] FluenceOfRhoAndZ(IOpticalPropertyRegion[][] regions, double[] rhos, double[] zs);
+
         /// <summary>
         ///  Overload of scalar FluenceOfRhoAndZ function. Determines fluence of tissue 'regions' and source-detector separations 'rhos' and 'zs'
         /// </summary>
@@ -345,8 +460,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="zs">depth bins</param>
         /// <returns>Fluence as a function of rhos and zs</returns>
         IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs);
-        #endregion
-        #region Complex[] FluenceOfRhoAndZAndFt(IOpticalPropertyRegion[][] regions, double[] rhos, double[] zs, double[] fts);
+
         /// <summary>
         ///  Overload of scalar FluenceOfRhoAndZ function. Determines fluence of tissue 'regions' and source-detector separations 'rhos' and 'zs'
         ///  at temporal frequencies fts
@@ -368,32 +482,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fts">temporal frequencies</param>
         /// <returns>Fluence as a function of rhos, zs and fts</returns>
         IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
-        #endregion
-
-        #endregion // IMultiRegionForwardSolver
-
-        #region double ROfRho(OpticalProperties op, double rho);
-        /// <summary>
-        /// Determines reflectance at source-detector separation rho
-        /// </summary>
-        /// <param name="op">optical properties of the medium</param>
-        /// <param name="rho">source-detector separation (mm)</param>
-        /// <returns>Reflectance at source-detector separation rho</returns>
-        double ROfRho(OpticalProperties op, double rho);
-        #endregion
-
-        #region double ROfRhoAndTime(OpticalProperties op, double rho, double ttime);
-        /// <summary>
-        /// Determines reflectance at source-detector separation rho and time
-        /// </summary>
-        /// <param name="op">optical properties of the medium</param>
-        /// <param name="rho">source-detector separation (mm)</param>
-        /// <param name="time">time (ns)</param>
-        /// <returns>Reflectance at source-detector separation rho and time</returns>
-        double ROfRhoAndTime(OpticalProperties op, double rho, double time);
-        #endregion
-
-        #region Complex ROfRhoAndFt(OpticalProperties op, double rho, double ft);
 
         /// <summary>
         /// Determines reflectance at source-detector separation rho and modulation frequency ft
@@ -403,9 +491,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="ft">modulation frequency (GHz)</param>
         /// <returns>Reflectance at source-detector separation rho and modulation frequency ft</returns>
         Complex ROfRhoAndFt(OpticalProperties op, double rho, double ft);
-        #endregion
 
-        #region double ROfFx(OpticalProperties op, double fx);
+
         /// <summary>
         /// Determines reflectance at spatial frequency fx
         /// </summary>
@@ -413,9 +500,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fx">spatial frequency (1/mm)</param>
         /// <returns>Reflectance at spatial frequency fx</returns>
         double ROfFx(OpticalProperties op, double fx);
-        #endregion
 
-        #region double ROfFxAndTime(OpticalProperties op, double fx, double time);
+
         /// <summary>
         /// Determines reflectance at spatial frequency fx and time
         /// </summary>
@@ -424,9 +510,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="time">time (ns)</param>
         /// <returns>Reflectance at spatial frequency fx and time</returns>
         double ROfFxAndTime(OpticalProperties op, double fx, double time);
-        #endregion
 
-        #region double ROfFxAndFt(OpticalProperties op, double fx, double ft);
+
 
         /// <summary>
         /// Determines reflectance at spatial frequency fx and modulation frequency ft
@@ -436,63 +521,61 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="ft">modulation frequency (GHz)</param>
         /// <returns>Reflectance at spatial frequency fx and modulation frequency ft</returns>
         Complex ROfFxAndFt(OpticalProperties op, double fx, double ft);
-        #endregion
 
-        // The following methods are designed to return values based on iteration 
-        // with the leftmost IEnumerable<Time> input being the top-level, and so-on
-        // such that the right-most input is at the inner-most loop
-
-        #region IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs);
         /// <summary>
         /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence at optical properties 'ops' and source-detector separations 'rhos' and 'zs'
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
+        /// and so-on such that the right-most input is at the inner-most loop
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="zs">z values (mm)</param>
         /// <returns>Fluence as a function of rhos and zs</returns>
         IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs);
-        #endregion
 
-        #region IEnumerable<double> FluenceOfRhoAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> times);
         /// <summary>
         /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and times 
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
+        /// and so-on such that the right-most input is at the inner-most loop
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="zs">z values (mm)</param>
         /// <param name="times">times (ns)</param>
         /// <returns>Fluence as a function of rhos, zs and times</returns>
-        /// <remarks>IEnumerables can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
         IEnumerable<double> FluenceOfRhoAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> times);
-        #endregion
 
-        #region IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
         /// <summary>
         /// Overload of scalar FluenceOfRhoAndZAndFt function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time frequencies 'fts'
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
+        /// and so-on such that the right-most input is at the inner-most loop
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="zs">z values (mm)</param>
         /// <param name="fts">modulation frequencies (GHz)</param>
         /// <returns>Fluence as a function of rhos, zs and fts</returns>
-        /// <remarks>IEnumerables can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
         IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
-        #endregion
 
-        #region IEnumerable<double> FluenceOfFxAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs);
+
         /// <summary>
         /// Overload of scalar FluenceOfFxAndZ function. Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
+        /// and so-on such that the right-most input is at the inner-most loop
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
         /// <param name="zs">z values (mm)</param>
         /// <returns>Fluence as a function of fxs and zs</returns>
         IEnumerable<double> FluenceOfFxAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs);
-        #endregion
 
-        #region IEnumerable<double> FluenceOfFxAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> ts);
+
         /// <summary>
         /// Overload of scalar FluenceOfFxAndZAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and times 
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
+        /// and so-on such that the right-most input is at the inner-most loop
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -500,11 +583,12 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="times">times (ns)</param>
         /// <returns>Fluence as a function of fxs, zs and times</returns>
         IEnumerable<double> FluenceOfFxAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> times);
-        #endregion
 
-        #region IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> fts);
+
         /// <summary>
         /// Overload of scalar FluenceOfFxAndZAndFt function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time frequencies 'fts'
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
+        /// and so-on such that the right-most input is at the inner-most loop
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -512,34 +596,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fts">modulation frequencies (GHz)</param>
         /// <returns>Fluence as a function of fxs, zs and fts</returns>
         IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> fts);
-        #endregion
-
-        #region IEnumerable<double> ROfRho(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos);
-        /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'ops' and source-detector separations 'rhos'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <returns>Reflectance as a function of rhos</returns>
-        IEnumerable<double> ROfRho(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos);
-
-        #endregion
-
-        #region IEnumerable<double> ROfRhoAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> ts);
-        /// <summary>
-        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and times 
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties </param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of rhos and times</returns>
-        /// <remarks>IEnumerables can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
-        IEnumerable<double> ROfRhoAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> times);
-
-
-        #endregion
-
-        #region IEnumerable<double> ROfRhoAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> fts);
 
         /// <summary>
         /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time frequencies 'fts'
@@ -548,12 +604,11 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="fts">modulation frequencies (GHz)</param>
         /// <returns>Reflectance as a function of rhos and fts</returns>
-        /// <remarks>IEnumerables can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
         IEnumerable<Complex> ROfRhoAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> fts);
 
-        #endregion
 
-        #region IEnumerable<double> ROfFx(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs);
+
         /// <summary>
         /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
         /// </summary>
@@ -563,7 +618,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<double> ROfFx(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs);
 
 
-        #region IEnumerable<double> ROfFxAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> ts);
         /// <summary>
         /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and times 
         /// </summary>
@@ -573,9 +627,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Reflectance as a function of fx and time</returns>
         IEnumerable<double> ROfFxAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> times);
 
-        #endregion
 
-        #region IEnumerable<Complex> ROfFxAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> fts);
+
 
         /// <summary>
         /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time frequencies 'fts'
@@ -586,53 +639,11 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Reflectance as a function of fxs and fts</returns>
         IEnumerable<Complex> ROfFxAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> fts);
 
-        #endregion
-
-        #endregion
-
         /// <summary>
         /// Beam Diameter
         /// </summary>
         double BeamDiameter { get; set; } // temp - should go in ISourceConfiguration or something
-
-        #region Convenience Overloads - default implementation handled by ForwardSolverBase (todo: these could alternatively be IForwardSolverExtensions instead of part of the contract)
-
-        /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'op' and source-detector separations 'rhos'
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <returns>Reflectance as a function of rhos</returns>
-        double[] ROfRho(OpticalProperties op, double[] rhos);
-
-        /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'ops' and source-detector separations 'rhos'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <returns>Reflectance as a function of rhos</returns>
-        double[] ROfRho(OpticalProperties[] ops, double[] rhos);
-
-        /// <summary>
-        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and times 
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of rhos and times</returns>
-        /// <remarks>IEnumerables can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
-        double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double[] times);
-
-        /// <summary>
-        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and times 
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of rho and time</returns>
-        /// <remarks>IEnumerables can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
-        double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double[] times);
-
+        
         /// <summary>
         /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and time frequencies 'fts'
         /// </summary>
@@ -640,7 +651,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="fts">modulation frequencies (GHz)</param>
         /// <returns>Reflectance as a function of rhos and fts</returns>
-        /// <remarks>IEnumerables can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
         Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double[] fts);
 
         /// <summary>
@@ -650,7 +661,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="fts">modulation frequencies (GHz)</param>
         /// <returns>Reflectance as a function of rhos and fts</returns>
-        /// <remarks>IEnumerables can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
         Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double[] fts);
 
         /// <summary>
@@ -705,60 +716,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Reflectance as a function of fxs and fts</returns>
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double[] fts);
 
-        // others...need comments...again, these could be extensions
-        /// <summary>
-        /// Overload of ROfRho. Determines reflectance at optical properties 'ops', and source-detector separation 'rho'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rho">source-detector separation (mm)</param>
-        /// <returns>Reflectance as a function of rho</returns>
-        double[] ROfRho(OpticalProperties[] ops, double rho);
-
-        /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and times 
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rho">source-detector separation (mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of rho and time</returns>
-        double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double[] times);
-
-        /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="time">time (ns)</param>
-        /// <returns>Reflectance as function of rhos and times</returns>
-        double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double time);
-
-        /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'op', source-detector separation 'rho' and times 
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="rho">source-detector separation (mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of rho and times</returns>
-        double[] ROfRhoAndTime(OpticalProperties op, double rho, double[] times);
-
-        /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and time 't'
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="rhos">source-detector separation (mm)</param>
-        /// <param name="time">time (ns)</param>
-        /// <returns>Reflectance as a function of rhos and time</returns>
-        double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double time);
-
-        /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and times 't'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rho">source-detector separation (mm)</param>
-        /// <param name="time">time (ns)</param>
-        /// <returns>Reflectance as a function of rho and time</returns>
-        double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double time);
-
         /// <summary>
         /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and modulation frequencies 'fts'
         /// </summary>
@@ -959,7 +916,5 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fts">modulation frequencies (GHz)</param>
         /// <returns>Reflectance as a function of fx, zs and fts</returns>
         Complex[] FluenceOfFxAndZAndFt(OpticalProperties[] ops, double[] fx, double[] zs, double[] fts);
-       
-        #endregion
     }
 }

From c7f7e5f4b535761645af6fd77d4b805c4d8d108a Mon Sep 17 00:00:00 2001
From: Lisa Malenfant <lisa.malenfant@uci.edu>
Date: Fri, 29 Sep 2023 13:38:27 -0700
Subject: [PATCH 2/9] Reorganized ROfRhoAndFt

---
 src/Vts/Interfaces/IForwardSolver.cs | 217 ++++++++++++++-------------
 1 file changed, 109 insertions(+), 108 deletions(-)

diff --git a/src/Vts/Interfaces/IForwardSolver.cs b/src/Vts/Interfaces/IForwardSolver.cs
index e2e20666d..f6e375a22 100644
--- a/src/Vts/Interfaces/IForwardSolver.cs
+++ b/src/Vts/Interfaces/IForwardSolver.cs
@@ -177,16 +177,6 @@ public interface IForwardSolver : INotifyPropertyChanged
         /// <returns>Reflectance at source-detector separation rho</returns>
         double ROfRhoAndTime(IOpticalPropertyRegion[] regions, double rho, double time);
 
-        /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
-        /// separations 'rhos', and times 'times'
-        /// </summary>
-        /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as function of rhos and times</returns>
-        double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double[] rhos, double[] times);
-
         /// <summary>
         /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
         /// separations 'rhos', and time 'time'
@@ -214,8 +204,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of rhos and times</returns>
-        double[] ROfRhoAndTime(IOpticalPropertyRegion[][] regions, double[] rhos, double[] times);
+        /// <returns>Reflectance as function of rhos and times</returns>
+        double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double[] rhos, double[] times);
 
         /// <summary>
         /// Overload of scalar ROfRho function. Determines reflectance at tissue regions, source-detector 
@@ -227,8 +217,103 @@ public interface IForwardSolver : INotifyPropertyChanged
         /// <returns>Reflectance as a function of rhos and times</returns>
         IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos,
             IEnumerable<double> times);
+
+        /// <summary>
+        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
+        /// separations 'rhos', and times 'times'
+        /// </summary>
+        /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of rhos and times</returns>
+        double[] ROfRhoAndTime(IOpticalPropertyRegion[][] regions, double[] rhos, double[] times);
         #endregion
 
+        #region ROfRhoAndFt
+        /// <summary>
+        /// Determines reflectance at source-detector separation rho and modulation frequency ft
+        /// </summary>
+        /// <param name="op">optical properties of the medium</param>
+        /// <param name="rho">source-detector separation (mm)</param>
+        /// <param name="ft">modulation frequency (GHz)</param>
+        /// <returns>Reflectance at source-detector separation rho and modulation frequency ft</returns>
+        Complex ROfRhoAndFt(OpticalProperties op, double rho, double ft);
+
+        /// <summary>
+        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and modulation frequency 'ft'
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="ft">modulation frequency (GHz)</param>
+        /// <returns>Reflectance as a function of rhos and ft</returns>
+        Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double ft);
+
+        /// <summary>
+        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'op', source-detector separation 'rho' and modulation frequencies 'fts'
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="rho">source-detector separation (mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Reflectance as a function of rho and fts</returns>
+        Complex[] ROfRhoAndFt(OpticalProperties op, double rho, double[] fts);
+
+        /// <summary>
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and time frequencies 'fts'
+        /// </summary>
+        /// <param name="op">optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Reflectance as a function of rhos and fts</returns>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double[] fts);
+
+        /// <summary>
+        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and modulation frequency 'ft'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rho">source-detector separation (mm)</param>
+        /// <param name="ft">modulation frequency (GHz)</param>
+        /// <returns>Reflectance as a function of rho and ft</returns>
+        Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double ft);
+
+        /// <summary>
+        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and modulation frequency 'ft'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="ft">modulation frequency (GHz)</param>
+        /// <returns>Reflectance as a function of rhos and ft</returns>
+        Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double ft);
+
+        /// <summary>
+        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and modulation frequencies 'fts'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rho">source-detector separation (mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Reflectance as a function of rho and fts</returns>
+        Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double[] fts);
+
+        /// <summary>
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time frequencies 'fts'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Reflectance as a function of rhos and fts</returns>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double[] fts);
+
+        /// <summary>
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time frequencies 'fts'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Reflectance as a function of rhos and fts</returns>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        IEnumerable<Complex> ROfRhoAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> fts);
+
         /// <summary>
         /// Determines reflectance at source-detector separation rho and temporal frequency ft
         /// </summary>
@@ -239,14 +324,14 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex ROfRhoAndFt(IOpticalPropertyRegion[] regions, double rho, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions, source-detector 
+        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
         /// separations 'rhos' and temporal frequencies fts
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="fts">temporal frequencies</param>
-        /// <returns>Reflectance as a function of rhos and fts</returns>
-        IEnumerable<Complex> ROfRhoAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> fts);
+        /// <param name="rhos">source-detector separation (mm)</param>
+        /// <param name="ft">temporal frequencies</param>
+        /// <returns>Reflectance as a function of rhos and ft</returns>
+        Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double ft);
 
         /// <summary>
         /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
@@ -263,20 +348,20 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// separations 'rhos' and temporal frequencies fts
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
-        /// <param name="rhos">source-detector separation (mm)</param>
-        /// <param name="ft">temporal frequencies</param>
-        /// <returns>Reflectance as a function of rhos and ft</returns>
-        Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double ft);
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="fts">temporal frequencies</param>
+        /// <returns>Reflectance as a function of rhos and fts</returns>
+        Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
+        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions, source-detector 
         /// separations 'rhos' and temporal frequencies fts
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="fts">temporal frequencies</param>
         /// <returns>Reflectance as a function of rhos and fts</returns>
-        Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double[] fts);
+        IEnumerable<Complex> ROfRhoAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> fts);
 
         /// <summary>
         /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
@@ -287,6 +372,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fts">temporal frequencies</param>
         /// <returns>Reflectance as a function of rhos and fts</returns>
         Complex[] ROfRhoAndFt(IOpticalPropertyRegion[][] regions, double[] rhos, double[] fts);
+        #endregion
 
 
         /// <summary>
@@ -483,14 +569,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Fluence as a function of rhos, zs and fts</returns>
         IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
 
-        /// <summary>
-        /// Determines reflectance at source-detector separation rho and modulation frequency ft
-        /// </summary>
-        /// <param name="op">optical properties of the medium</param>
-        /// <param name="rho">source-detector separation (mm)</param>
-        /// <param name="ft">modulation frequency (GHz)</param>
-        /// <returns>Reflectance at source-detector separation rho and modulation frequency ft</returns>
-        Complex ROfRhoAndFt(OpticalProperties op, double rho, double ft);
 
 
         /// <summary>
@@ -597,18 +675,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Fluence as a function of fxs, zs and fts</returns>
         IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> fts);
 
-        /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time frequencies 'fts'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of rhos and fts</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
-        IEnumerable<Complex> ROfRhoAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> fts);
-
-
-
         /// <summary>
         /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
         /// </summary>
@@ -644,26 +710,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// </summary>
         double BeamDiameter { get; set; } // temp - should go in ISourceConfiguration or something
         
-        /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and time frequencies 'fts'
-        /// </summary>
-        /// <param name="op">optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of rhos and fts</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
-        Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double[] fts);
-
-        /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time frequencies 'fts'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of rhos and fts</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
-        Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double[] fts);
-
         /// <summary>
         /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'op' and spatial frequencies 'fxs'
         /// </summary>
@@ -716,51 +762,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Reflectance as a function of fxs and fts</returns>
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double[] fts);
 
-        /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and modulation frequencies 'fts'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rho">source-detector separation (mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of rho and fts</returns>
-        Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double[] fts);
-
-        /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and modulation frequency 'ft'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="ft">modulation frequency (GHz)</param>
-        /// <returns>Reflectance as a function of rhos and ft</returns>
-        Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double ft);
-
-        /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'op', source-detector separation 'rho' and modulation frequencies 'fts'
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="rho">source-detector separation (mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of rho and fts</returns>
-        Complex[] ROfRhoAndFt(OpticalProperties op, double rho, double[] fts);
-
-        /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and modulation frequency 'ft'
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="ft">modulation frequency (GHz)</param>
-        /// <returns>Reflectance as a function of rhos and ft</returns>
-        Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double ft);
-
-        /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and modulation frequency 'ft'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="rho">source-detector separation (mm)</param>
-        /// <param name="ft">modulation frequency (GHz)</param>
-        /// <returns>Reflectance as a function of rho and ft</returns>
-        Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double ft);
-
         /// <summary>
         /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequency 'fx'
         /// </summary>

From 3699baaf6d31a2de1db7955ad67dc5f376d1fc86 Mon Sep 17 00:00:00 2001
From: Lisa Malenfant <lisa.malenfant@uci.edu>
Date: Fri, 29 Sep 2023 13:45:19 -0700
Subject: [PATCH 3/9] Reorganized ROfFx

---
 src/Vts/Interfaces/IForwardSolver.cs | 101 +++++++++++++--------------
 1 file changed, 49 insertions(+), 52 deletions(-)

diff --git a/src/Vts/Interfaces/IForwardSolver.cs b/src/Vts/Interfaces/IForwardSolver.cs
index f6e375a22..aee618b05 100644
--- a/src/Vts/Interfaces/IForwardSolver.cs
+++ b/src/Vts/Interfaces/IForwardSolver.cs
@@ -374,6 +374,46 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(IOpticalPropertyRegion[][] regions, double[] rhos, double[] fts);
         #endregion
 
+        #region ROfFx
+        /// <summary>
+        /// Determines reflectance at spatial frequency fx
+        /// </summary>
+        /// <param name="op">optical properties of the medium</param>
+        /// <param name="fx">spatial frequency (1/mm)</param>
+        /// <returns>Reflectance at spatial frequency fx</returns>
+        double ROfFx(OpticalProperties op, double fx);
+
+        /// <summary>
+        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'op' and spatial frequencies 'fxs'
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <returns>Reflectance as a function of fxs</returns>
+        double[] ROfFx(OpticalProperties op, double[] fxs);
+
+        /// <summary>
+        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequency 'fx'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fx">spatial frequency (1/mm)</param>
+        /// <returns>Reflectance as a function of fx</returns>
+        double[] ROfFx(OpticalProperties[] ops, double fx);
+
+        /// <summary>
+        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <returns>Reflectance as a function of fxs</returns>
+        double[] ROfFx(OpticalProperties[] ops, double[] fxs);
+
+        /// <summary>
+        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <returns>Reflectance as a function of fxs</returns>
+        IEnumerable<double> ROfFx(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs);
 
         /// <summary>
         /// Determines reflectance at spatial frequency 
@@ -383,14 +423,6 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Reflectance at spatial frequency fx</returns>
         double ROfFx(IOpticalPropertyRegion[] regions, double fx);
 
-        /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions and source-detector separations 'rhos'
-        /// </summary>
-        /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
-        /// <param name="fxs">spatial frequencies</param>
-        /// <returns>Reflectance as a function of fxs</returns>
-        IEnumerable<double> ROfFx(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs);
-
         /// <summary>
         /// Overload of scalar ROfFx function. Determines reflectance given tissue regions and spatial frequencies 'fxs'
         /// </summary>
@@ -399,6 +431,14 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Reflectance at spatial frequency</returns>
         double[] ROfFx(IOpticalPropertyRegion[] regions, double[] fxs);
 
+        /// <summary>
+        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions and source-detector separations 'rhos'
+        /// </summary>
+        /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
+        /// <param name="fxs">spatial frequencies</param>
+        /// <returns>Reflectance as a function of fxs</returns>
+        IEnumerable<double> ROfFx(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs);
+
         /// <summary>
         /// Overload of scalar ROfFx function. Determines reflectance given tissue regions and spatial frequencies 'fxs'
         /// </summary>
@@ -406,6 +446,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fxs">spatial frequencies</param>
         /// <returns>Reflectance at spatial frequency</returns>
         double[] ROfFx(IOpticalPropertyRegion[][] regions, double[] fxs);
+        #endregion
 
 
         /// <summary>
@@ -569,17 +610,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Fluence as a function of rhos, zs and fts</returns>
         IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
 
-
-
-        /// <summary>
-        /// Determines reflectance at spatial frequency fx
-        /// </summary>
-        /// <param name="op">optical properties of the medium</param>
-        /// <param name="fx">spatial frequency (1/mm)</param>
-        /// <returns>Reflectance at spatial frequency fx</returns>
-        double ROfFx(OpticalProperties op, double fx);
-
-
         /// <summary>
         /// Determines reflectance at spatial frequency fx and time
         /// </summary>
@@ -675,15 +705,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Fluence as a function of fxs, zs and fts</returns>
         IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> fts);
 
-        /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <returns>Reflectance as a function of fxs</returns>
-        IEnumerable<double> ROfFx(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs);
-
-
         /// <summary>
         /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and times 
         /// </summary>
@@ -710,22 +731,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// </summary>
         double BeamDiameter { get; set; } // temp - should go in ISourceConfiguration or something
         
-        /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'op' and spatial frequencies 'fxs'
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <returns>Reflectance as a function of fxs</returns>
-        double[] ROfFx(OpticalProperties op, double[] fxs);
-
-        /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <returns>Reflectance as a function of fxs</returns>
-        double[] ROfFx(OpticalProperties[] ops, double[] fxs);
-
         /// <summary>
         /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and times 
         /// </summary>
@@ -762,14 +767,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Reflectance as a function of fxs and fts</returns>
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double[] fts);
 
-        /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequency 'fx'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fx">spatial frequency (1/mm)</param>
-        /// <returns>Reflectance as a function of fx</returns>
-        double[] ROfFx(OpticalProperties[] ops, double fx);
-
         /// <summary>
         /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and times 
         /// </summary>

From 5dedbd00f5f73c0e86a91314de0458f1644acbaa Mon Sep 17 00:00:00 2001
From: Lisa Malenfant <lisa.malenfant@uci.edu>
Date: Fri, 29 Sep 2023 13:57:32 -0700
Subject: [PATCH 4/9] Reorganize ROfFxAndTime

---
 src/Vts/Interfaces/IForwardSolver.cs | 210 +++++++++++++--------------
 1 file changed, 103 insertions(+), 107 deletions(-)

diff --git a/src/Vts/Interfaces/IForwardSolver.cs b/src/Vts/Interfaces/IForwardSolver.cs
index aee618b05..d8ffea844 100644
--- a/src/Vts/Interfaces/IForwardSolver.cs
+++ b/src/Vts/Interfaces/IForwardSolver.cs
@@ -448,6 +448,87 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFx(IOpticalPropertyRegion[][] regions, double[] fxs);
         #endregion
 
+        #region ROfFxAndTime
+        /// <summary>
+        /// Determines reflectance at spatial frequency fx and time
+        /// </summary>
+        /// <param name="op">optical properties of the medium</param>
+        /// <param name="fx">spatial frequency (1/mm)</param>
+        /// <param name="time">time (ns)</param>
+        /// <returns>Reflectance at spatial frequency fx and time</returns>
+        double ROfFxAndTime(OpticalProperties op, double fx, double time);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and time 't'
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="fxs">spatial frequency (1/mm)</param>
+        /// <param name="time">times (ns)</param>
+        /// <returns>Reflectance as a function of fxs and time</returns>
+        double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double time);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op', spatial frequency 'fx' and times 
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="fx">spatial frequency (1/mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of fx and times</returns>
+        double[] ROfFxAndTime(OpticalProperties op, double fx, double[] times);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and times 
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of fxs and times</returns>
+        double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double[] times);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and time 't'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fx">spatial frequency (1/mm)</param>
+        /// <param name="time">time (ns)</param>
+        /// <returns>Reflectance as a function of fx and time</returns>
+        double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double time);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time 
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="time">time (ns)</param>
+        /// <returns>Reflectance as a function of fxs and time</returns>
+        double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double time);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and times 
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fx">spatial frequency (1/mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of fx and times</returns>
+        double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double[] times);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and times 
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of fxs and times</returns>
+        double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double[] times);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and times 
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of fx and time</returns>
+        IEnumerable<double> ROfFxAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> times);
 
         /// <summary>
         /// Determines reflectance at spatial frequency and time
@@ -459,25 +540,14 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTim function. Determines reflectance at tissue regions, spatial frequencies 'fxs', 
-        /// and times 'times'
-        /// </summary>
-        /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
-        /// <param name="fxs">spatial frequencies</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance at spatial frequency and time</returns>
-        IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs,
-            IEnumerable<double> times);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions, spatial frequencies 'fxs', 
-        /// and times 'times'
+        /// Overload of scalar ROfFxAndTime function.  Determines reflectance given tissue regions, spatial frequencies 'fxs',
+        /// and time 'time'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance at spatial freq. and time</returns>
-        double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double[] times);
+        /// <param name="time">time (ns)</param>
+        /// <returns>Reflectance as a function of fxs and time</returns>
+        double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double time);
 
         /// <summary>
         /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions, spatial frequency 'fx',
@@ -490,14 +560,25 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function.  Determines reflectance given tissue regions, spatial frequencies 'fxs',
-        /// and time 'time'
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions, spatial frequencies 'fxs', 
+        /// and times 'times'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
-        /// <param name="time">time (ns)</param>
-        /// <returns>Reflectance as a function of fxs and time</returns>
-        double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double time);
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance at spatial freq. and time</returns>
+        double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double[] times);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndTim function. Determines reflectance at tissue regions, spatial frequencies 'fxs', 
+        /// and times 'times'
+        /// </summary>
+        /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
+        /// <param name="fxs">spatial frequencies</param>
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance at spatial frequency and time</returns>
+        IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs,
+            IEnumerable<double> times);
 
         /// <summary>
         /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions, spatial frequencies 'fxs', 
@@ -508,6 +589,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="times">times (ns)</param>
         /// <returns>Reflectance at spatial freq. and time</returns>
         double[] ROfFxAndTime(IOpticalPropertyRegion[][] regions, double[] fxs, double[] times);
+        #endregion
 
 
         /// <summary>
@@ -610,17 +692,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Fluence as a function of rhos, zs and fts</returns>
         IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
 
-        /// <summary>
-        /// Determines reflectance at spatial frequency fx and time
-        /// </summary>
-        /// <param name="op">optical properties of the medium</param>
-        /// <param name="fx">spatial frequency (1/mm)</param>
-        /// <param name="time">time (ns)</param>
-        /// <returns>Reflectance at spatial frequency fx and time</returns>
-        double ROfFxAndTime(OpticalProperties op, double fx, double time);
-
-
-
         /// <summary>
         /// Determines reflectance at spatial frequency fx and modulation frequency ft
         /// </summary>
@@ -705,18 +776,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Fluence as a function of fxs, zs and fts</returns>
         IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> fts);
 
-        /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and times 
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of fx and time</returns>
-        IEnumerable<double> ROfFxAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> times);
-
-
-
-
         /// <summary>
         /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time frequencies 'fts'
         /// </summary>
@@ -731,24 +790,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// </summary>
         double BeamDiameter { get; set; } // temp - should go in ISourceConfiguration or something
         
-        /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and times 
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of fxs and times</returns>
-        double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double[] times);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and times 
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of fxs and times</returns>
-        double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double[] times);
-
         /// <summary>
         /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and time frequencies 'fts'
         /// </summary>
@@ -767,51 +808,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Reflectance as a function of fxs and fts</returns>
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double[] fts);
 
-        /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and times 
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fx">spatial frequency (1/mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of fx and times</returns>
-        double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double[] times);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time 
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="time">time (ns)</param>
-        /// <returns>Reflectance as a function of fxs and time</returns>
-        double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double time);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op', spatial frequency 'fx' and times 
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="fx">spatial frequency (1/mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of fx and times</returns>
-        double[] ROfFxAndTime(OpticalProperties op, double fx, double[] times);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and time 't'
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="fxs">spatial frequency (1/mm)</param>
-        /// <param name="time">times (ns)</param>
-        /// <returns>Reflectance as a function of fxs and time</returns>
-        double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double time);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and time 't'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fx">spatial frequency (1/mm)</param>
-        /// <param name="time">time (ns)</param>
-        /// <returns>Reflectance as a function of fx and time</returns>
-        double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double time);
-
         /// <summary>
         /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and modulation frequencies 'fts'
         /// </summary>

From 3cf30405cde608d357f15ca2adb5a386ff78f32b Mon Sep 17 00:00:00 2001
From: Lisa Malenfant <lisa.malenfant@uci.edu>
Date: Fri, 29 Sep 2023 14:20:24 -0700
Subject: [PATCH 5/9] Reorganize ROfFxAndFt

---
 src/Vts/Interfaces/IForwardSolver.cs | 205 ++++++++++++++-------------
 1 file changed, 103 insertions(+), 102 deletions(-)

diff --git a/src/Vts/Interfaces/IForwardSolver.cs b/src/Vts/Interfaces/IForwardSolver.cs
index d8ffea844..92d681cef 100644
--- a/src/Vts/Interfaces/IForwardSolver.cs
+++ b/src/Vts/Interfaces/IForwardSolver.cs
@@ -9,6 +9,11 @@ namespace Vts
     /// </summary>
     public interface IForwardSolver : INotifyPropertyChanged
     {
+        /// <summary>
+        /// Beam Diameter
+        /// </summary>
+        double BeamDiameter { get; set; }
+
         #region ROfRho
         /// <summary>
         /// Determines reflectance at source-detector separation rho
@@ -591,6 +596,87 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(IOpticalPropertyRegion[][] regions, double[] fxs, double[] times);
         #endregion
 
+        #region ROfFxAndFt
+        /// <summary>
+        /// Determines reflectance at spatial frequency fx and modulation frequency ft
+        /// </summary>
+        /// <param name="op">optical properties of the medium</param>
+        /// <param name="fx">spatial frequency (1/mm)</param>
+        /// <param name="ft">modulation frequency (GHz)</param>
+        /// <returns>Reflectance at spatial frequency fx and modulation frequency ft</returns>
+        Complex ROfFxAndFt(OpticalProperties op, double fx, double ft);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op', spatial frequency 'fxs' and modulation frequency 'ft'
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="ft">modulation frequency (GHz)</param>
+        /// <returns>Reflectance as a function of fxs and ft</returns>
+        Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double ft);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op', spatial frequency 'fx' and modulation frequencies 'fts'
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="fx">spatial frequency (1/mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Reflectance as a function of fx and fts</returns>
+        Complex[] ROfFxAndFt(OpticalProperties op, double fx, double[] fts);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and time frequencies 'fts'
+        /// </summary>
+        /// <param name="op">medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Reflectance as a function of fxs and fts</returns>
+        Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double[] fts);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and modulation frequencies 'ft'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fx">spatial frequency (1/mm)</param>
+        /// <param name="ft">modulation frequency (GHz)</param>
+        /// <returns>Reflectance as a function of fx and ft</returns>
+        Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double ft);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequency 'fxs' and modulation frequency 'ft'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="ft">modulation frequency (GHz)</param>
+        /// <returns>Reflectance as a function of fxs and ft</returns>
+        Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double ft);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and modulation frequencies 'fts'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fx">spatial frequency (1/mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Reflectance as a function of fx and fts</returns>
+        Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double[] fts);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time frequencies 'fts'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Reflectance as a function of fxs and fts</returns>
+        Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double[] fts);
+
+        /// <summary>
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time frequencies 'fts'
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Reflectance as a function of fxs and fts</returns>
+        IEnumerable<Complex> ROfFxAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> fts);
 
         /// <summary>
         /// Determines reflectance at spatial frequency fx and temporal frequency ft
@@ -602,14 +688,14 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex ROfFxAndFt(IOpticalPropertyRegion[] regions, double fx, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at tissue regions, spatial frequencies 'fxs' and 
-        /// temporal frequencies fts
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance given tissue regions, spatial frequencies 
+        /// 'fs' and temporal frequencies fts
         /// </summary>
-        /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
+        /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
-        /// <param name="fts">temporal frequencies</param>
-        /// <returns>Reflectance as a function of fxs and fts</returns>
-        IEnumerable<Complex> ROfFxAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs, IEnumerable<double> fts);
+        /// <param name="ft">temporal frequencies</param>
+        /// <returns>Reflectance as a function of fxs and ft</returns>
+        Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double[] fxs, double ft);
 
         /// <summary>
         /// Overload of scalar ROfFxAndFt function. Determines reflectance given tissue regions, source-detector 
@@ -621,16 +707,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Reflectance as a function of fx and fts</returns>
         Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double fx, double[] fts);
 
-        /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance given tissue regions, spatial frequencies 
-        /// 'fs' and temporal frequencies fts
-        /// </summary>
-        /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
-        /// <param name="fxs">spatial frequencies</param>
-        /// <param name="ft">temporal frequencies</param>
-        /// <returns>Reflectance as a function of fxs and ft</returns>
-        Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double[] fxs, double ft);
-
         /// <summary>
         /// Overload of scalar ROfFxAndFt function. Determines reflectance given tissue regions, spatial 
         /// frequencies 'fxs' and temporal frequencies fts
@@ -641,6 +717,16 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Reflectance at spatial freq. and temporal freq.</returns>
         Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double[] fxs, double[] fts);
 
+        /// <summary>
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at tissue regions, spatial frequencies 'fxs' and 
+        /// temporal frequencies fts
+        /// </summary>
+        /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
+        /// <param name="fxs">spatial frequencies</param>
+        /// <param name="fts">temporal frequencies</param>
+        /// <returns>Reflectance as a function of fxs and fts</returns>
+        IEnumerable<Complex> ROfFxAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs, IEnumerable<double> fts);
+
         /// <summary>
         /// Overload of scalar ROfFxAndFt function. Determines reflectance given tissue regions, spatial 
         /// frequencies 'fxs', and temporal frequencies fts
@@ -650,6 +736,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fts">temporal frequencies</param>
         /// <returns>Reflectance at spatial freq. and temporal freq.</returns>
         Complex[] ROfFxAndFt(IOpticalPropertyRegion[][] regions, double[] fxs, double[] fts);
+        #endregion
 
 
         /// <summary>
@@ -692,15 +779,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Fluence as a function of rhos, zs and fts</returns>
         IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
 
-        /// <summary>
-        /// Determines reflectance at spatial frequency fx and modulation frequency ft
-        /// </summary>
-        /// <param name="op">optical properties of the medium</param>
-        /// <param name="fx">spatial frequency (1/mm)</param>
-        /// <param name="ft">modulation frequency (GHz)</param>
-        /// <returns>Reflectance at spatial frequency fx and modulation frequency ft</returns>
-        Complex ROfFxAndFt(OpticalProperties op, double fx, double ft);
-
         /// <summary>
         /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence at optical properties 'ops' and source-detector separations 'rhos' and 'zs'
         /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
@@ -776,83 +854,6 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <returns>Fluence as a function of fxs, zs and fts</returns>
         IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> fts);
 
-        /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time frequencies 'fts'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of fxs and fts</returns>
-        IEnumerable<Complex> ROfFxAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> fts);
-
-        /// <summary>
-        /// Beam Diameter
-        /// </summary>
-        double BeamDiameter { get; set; } // temp - should go in ISourceConfiguration or something
-        
-        /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and time frequencies 'fts'
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of fxs and fts</returns>
-        Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double[] fts);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time frequencies 'fts'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of fxs and fts</returns>
-        Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double[] fts);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and modulation frequencies 'fts'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fx">spatial frequency (1/mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of fx and fts</returns>
-        Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double[] fts);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequency 'fxs' and modulation frequency 'ft'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="ft">modulation frequency (GHz)</param>
-        /// <returns>Reflectance as a function of fxs and ft</returns>
-        Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double ft);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op', spatial frequency 'fx' and modulation frequencies 'fts'
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="fx">spatial frequency (1/mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of fx and fts</returns>
-        Complex[] ROfFxAndFt(OpticalProperties op, double fx, double[] fts);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op', spatial frequency 'fxs' and modulation frequency 'ft'
-        /// </summary>
-        /// <param name="op">medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="ft">modulation frequency (GHz)</param>
-        /// <returns>Reflectance as a function of fxs and ft</returns>
-        Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double ft);
-
-        /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and modulation frequencies 'ft'
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fx">spatial frequency (1/mm)</param>
-        /// <param name="ft">modulation frequency (GHz)</param>
-        /// <returns>Reflectance as a function of fx and ft</returns>
-        Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double ft);
-
         /// <summary>
         /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence at optical properties 'ops' and source-detector separations 'rhos' and 'zs'
         /// </summary>

From 77365c54604d1080a0293aae1642c4916d2dd115 Mon Sep 17 00:00:00 2001
From: Lisa Malenfant <lisa.malenfant@uci.edu>
Date: Fri, 29 Sep 2023 15:30:22 -0700
Subject: [PATCH 6/9] Reorganize Fluence methods

---
 src/Vts/Interfaces/IForwardSolver.cs | 386 ++++++++++++++++-----------
 1 file changed, 229 insertions(+), 157 deletions(-)

diff --git a/src/Vts/Interfaces/IForwardSolver.cs b/src/Vts/Interfaces/IForwardSolver.cs
index 92d681cef..a1b7a0a2e 100644
--- a/src/Vts/Interfaces/IForwardSolver.cs
+++ b/src/Vts/Interfaces/IForwardSolver.cs
@@ -24,7 +24,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double ROfRho(OpticalProperties op, double rho);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'op' and source-detector separations 'rhos'
+        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'op' and
+        /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -40,7 +41,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRho(OpticalProperties[] ops, double rho);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'ops' and source-detector separations 'rhos'
+        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'ops' and
+        /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -48,7 +50,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRho(OpticalProperties[] ops, double[] rhos);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'ops' and source-detector separations 'rhos'
+        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'ops' and
+        /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -64,7 +67,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double ROfRho(IOpticalPropertyRegion[] regions, double rho);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions and source-detector separations 'rhos'
+        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions and
+        /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -72,7 +76,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRho(IOpticalPropertyRegion[] regions, double[] rhos);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions and source-detector separations 'rhos'
+        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions and
+        /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -80,7 +85,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         IEnumerable<double> ROfRho(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions and source-detector separations 'rhos'
+        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions and
+        /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -99,17 +105,20 @@ public interface IForwardSolver : INotifyPropertyChanged
         double ROfRhoAndTime(OpticalProperties op, double rho, double time);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and times 
+        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'op',
+        /// source-detector separations 'rhos' and times 
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="times">times (ns)</param>
         /// <returns>Reflectance as a function of rhos and times</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions)
+        /// on single items</remarks>
         double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double[] times);
 
         /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'op', source-detector separation 'rho' and times 
+        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'op', source-detector
+        /// separation 'rho' and times 
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -118,7 +127,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties op, double rho, double[] times);
 
         /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and time 't'
+        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'op', source-detector
+        /// separations 'rhos' and time 't'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="rhos">source-detector separation (mm)</param>
@@ -127,7 +137,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double time);
 
         /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and times 't'
+        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector
+        /// separation 'rho' and times 't'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -136,7 +147,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double time);
 
         /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time
+        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector
+        /// separations 'rhos' and time
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -145,7 +157,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double time);
 
         /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and times 
+        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector
+        /// separation 'rho' and times 
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -154,23 +167,27 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and times 
+        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'ops',
+        /// source-detector separations 'rhos' and times 
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="times">times (ns)</param>
         /// <returns>Reflectance as a function of rho and time</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions)
+        /// on single items</remarks>
         double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and times 
+        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'ops',
+        /// source-detector separations 'rhos' and times 
         /// </summary>
         /// <param name="ops">sets of medium optical properties </param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="times">times (ns)</param>
         /// <returns>Reflectance as a function of rhos and times</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions)
+        /// on single items</remarks>
         IEnumerable<double> ROfRhoAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> times);
 
         /// <summary>
@@ -245,7 +262,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex ROfRhoAndFt(OpticalProperties op, double rho, double ft);
 
         /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and modulation frequency 'ft'
+        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'op', source-detector
+        /// separations 'rhos' and modulation frequency 'ft'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -254,7 +272,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double ft);
 
         /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'op', source-detector separation 'rho' and modulation frequencies 'fts'
+        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'op', source-detector
+        /// separation 'rho' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -263,17 +282,20 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties op, double rho, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'op', source-detector separations 'rhos' and time frequencies 'fts'
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'op',
+        /// source-detector separations 'rhos' and time frequencies 'fts'
         /// </summary>
         /// <param name="op">optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="fts">modulation frequencies (GHz)</param>
         /// <returns>Reflectance as a function of rhos and fts</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions)
+        /// on single items</remarks>
         Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double[] fts);
 
         /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and modulation frequency 'ft'
+        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separation
+        /// 'rho' and modulation frequency 'ft'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -282,7 +304,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double ft);
 
         /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and modulation frequency 'ft'
+        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector
+        /// separations 'rhos' and modulation frequency 'ft'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -291,7 +314,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double ft);
 
         /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separation 'rho' and modulation frequencies 'fts'
+        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector
+        /// separation 'rho' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -300,23 +324,27 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time frequencies 'fts'
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops',
+        /// source-detector separations 'rhos' and time frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="fts">modulation frequencies (GHz)</param>
         /// <returns>Reflectance as a function of rhos and fts</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions)
+        /// on single items</remarks>
         Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time frequencies 'fts'
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops',
+        /// source-detector separations 'rhos' and time frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="fts">modulation frequencies (GHz)</param>
         /// <returns>Reflectance as a function of rhos and fts</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions)
+        /// on single items</remarks>
         IEnumerable<Complex> ROfRhoAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> fts);
 
         /// <summary>
@@ -329,7 +357,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex ROfRhoAndFt(IOpticalPropertyRegion[] regions, double rho, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance given tissue regions, source-detector 
         /// separations 'rhos' and temporal frequencies fts
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
@@ -339,7 +367,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance given tissue regions, source-detector 
         /// separations 'rhos' and temporal frequencies fts
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
@@ -349,7 +377,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double rho, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance given tissue regions, source-detector 
         /// separations 'rhos' and temporal frequencies fts
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
@@ -359,7 +387,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions, source-detector 
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at tissue regions, source-detector 
         /// separations 'rhos' and temporal frequencies fts
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
@@ -369,7 +397,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<Complex> ROfRhoAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> fts);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
+        /// Overload of scalar ROfRhoAndFt function. Determines reflectance given tissue regions, source-detector 
         /// separations 'rhos', and temporal frequencies fts
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
@@ -405,7 +433,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFx(OpticalProperties[] ops, double fx);
 
         /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
+        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops'
+        /// and spatial frequencies 'fxs'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -413,7 +442,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFx(OpticalProperties[] ops, double[] fxs);
 
         /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
+        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops'
+        /// and spatial frequencies 'fxs'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -429,7 +459,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double ROfFx(IOpticalPropertyRegion[] regions, double fx);
 
         /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance given tissue regions and spatial frequencies 'fxs'
+        /// Overload of scalar ROfFx function. Determines reflectance given tissue regions
+        /// and spatial frequencies 'fxs'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -437,7 +468,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFx(IOpticalPropertyRegion[] regions, double[] fxs);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions and source-detector separations 'rhos'
+        /// Overload of scalar ROfFx function. Determines reflectance at tissue regions
+        /// and source-detector separations 'rhos'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -464,7 +496,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double ROfFxAndTime(OpticalProperties op, double fx, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and time 't'
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op',
+        /// spatial frequencies 'fxs' and time 't'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="fxs">spatial frequency (1/mm)</param>
@@ -473,7 +506,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op', spatial frequency 'fx' and times 
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op',
+        /// spatial frequency 'fx' and times 
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -482,7 +516,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties op, double fx, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and times 
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op',
+        /// spatial frequencies 'fxs' and times 
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -491,7 +526,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and time 't'
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops',
+        /// spatial frequency 'fx' and time 't'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -500,7 +536,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time 
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and time 
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -509,7 +546,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and times 
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops',
+        /// spatial frequency 'fx' and times 
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -518,7 +556,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and times 
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and times 
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -527,7 +566,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and times 
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and times 
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -545,8 +585,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function.  Determines reflectance given tissue regions, spatial frequencies 'fxs',
-        /// and time 'time'
+        /// Overload of scalar ROfFxAndTime function.  Determines reflectance given tissue regions,
+        /// spatial frequencies 'fxs', and time 'time'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -555,8 +595,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions, spatial frequency 'fx',
-        /// and times 'times'
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions,
+        /// spatial frequency 'fx', and times 'times'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fx">spatial frequency</param>
@@ -565,8 +605,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions, spatial frequencies 'fxs', 
-        /// and times 'times'
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions,
+        /// spatial frequencies 'fxs', and times 'times'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -575,8 +615,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTim function. Determines reflectance at tissue regions, spatial frequencies 'fxs', 
-        /// and times 'times'
+        /// Overload of scalar ROfFxAndTim function. Determines reflectance at tissue regions,
+        /// spatial frequencies 'fxs', and times 'times'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -586,8 +626,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
             IEnumerable<double> times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions, spatial frequencies 'fxs', 
-        /// and times 'times'
+        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions,
+        /// spatial frequencies 'fxs', and times 'times'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -607,7 +647,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex ROfFxAndFt(OpticalProperties op, double fx, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op', spatial frequency 'fxs' and modulation frequency 'ft'
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op',
+        /// spatial frequency 'fxs' and modulation frequency 'ft'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -616,7 +657,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op', spatial frequency 'fx' and modulation frequencies 'fts'
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op',
+        /// spatial frequency 'fx' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -625,7 +667,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties op, double fx, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op', spatial frequencies 'fxs' and time frequencies 'fts'
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op',
+        /// spatial frequencies 'fxs' and time frequencies 'fts'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -634,7 +677,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and modulation frequencies 'ft'
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops',
+        /// spatial frequency 'fx' and modulation frequencies 'ft'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -643,7 +687,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequency 'fxs' and modulation frequency 'ft'
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops',
+        /// spatial frequency 'fxs' and modulation frequency 'ft'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -652,7 +697,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequency 'fx' and modulation frequencies 'fts'
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops',
+        /// spatial frequency 'fx' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -661,7 +707,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time frequencies 'fts'
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and time frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -670,7 +717,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time frequencies 'fts'
+        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and time frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -738,172 +786,182 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(IOpticalPropertyRegion[][] regions, double[] fxs, double[] fts);
         #endregion
 
-
+        #region FluenceOfRhoAndZ
         /// <summary>
-        ///  Overload of scalar FluenceOfRhoAndZ function. Determines fluence of tissue 'regions' and source-detector separations 'rhos' and 'zs'
+        /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence at optical properties 'ops' and
+        /// source-detector separations 'rhos' and 'zs'
         /// </summary>
-        /// <param name="regions">tissue regions</param>
-        /// <param name="rhos">source-detector separations</param>
-        /// <param name="zs">depth bins</param>
-        /// <returns>Fluence as a function of rhos and zs</returns>
-        double[] FluenceOfRhoAndZ(IOpticalPropertyRegion[][] regions, double[] rhos, double[] zs);
+        /// <param name="ops">sets of medium optical properties </param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="zs">z values (mm)</param>
+        /// <returns>Reflectance as a function of rhos and zs</returns>
+        double[] FluenceOfRhoAndZ(OpticalProperties[] ops, double[] rhos, double[] zs);
 
         /// <summary>
-        ///  Overload of scalar FluenceOfRhoAndZ function. Determines fluence of tissue 'regions' and source-detector separations 'rhos' and 'zs'
+        /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence at optical properties 'ops' and
+        /// source-detector separations 'rhos' and 'zs'
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
+        /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>
-        /// <param name="regions">tissue regions</param>
-        /// <param name="rhos">source-detector separations</param>
-        /// <param name="zs">depth bins</param>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="zs">z values (mm)</param>
         /// <returns>Fluence as a function of rhos and zs</returns>
-        IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs);
+        IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs);
 
         /// <summary>
-        ///  Overload of scalar FluenceOfRhoAndZ function. Determines fluence of tissue 'regions' and source-detector separations 'rhos' and 'zs'
-        ///  at temporal frequencies fts
+        ///  Overload of scalar FluenceOfRhoAndZ function. Determines fluence of tissue 'regions' and
+        /// source-detector separations 'rhos' and 'zs'
         /// </summary>
         /// <param name="regions">tissue regions</param>
         /// <param name="rhos">source-detector separations</param>
         /// <param name="zs">depth bins</param>
-        /// <param name="fts">temporal frequencies</param>
-        /// <returns>Fluence as a function of rhos, zs and fts</returns>
-        Complex[] FluenceOfRhoAndZAndFt(IOpticalPropertyRegion[][] regions, double[] rhos, double[] zs, double[] fts);
+        /// <returns>Fluence as a function of rhos and zs</returns>
+        IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs);
 
         /// <summary>
-        ///  Overload of scalar FluenceOfRhoAndZAndFt function. Determines fluence of tissue 'regions' and source-detector separations 'rhos' and 'zs'
-        ///  at temporal frequencies fts
+        /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence of tissue 'regions' and
+        /// source-detector separations 'rhos' and 'zs'
         /// </summary>
         /// <param name="regions">tissue regions</param>
         /// <param name="rhos">source-detector separations</param>
         /// <param name="zs">depth bins</param>
-        /// <param name="fts">temporal frequencies</param>
-        /// <returns>Fluence as a function of rhos, zs and fts</returns>
-        IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
+        /// <returns>Fluence as a function of rhos and zs</returns>
+        double[] FluenceOfRhoAndZ(IOpticalPropertyRegion[][] regions, double[] rhos, double[] zs);
+        #endregion
 
+        #region FluenceOfRhoAndZAndTime
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence at optical properties 'ops' and source-detector separations 'rhos' and 'zs'
-        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
-        /// and so-on such that the right-most input is at the inner-most loop
+        /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops',
+        /// source-detector separations 'rhos', z values 'zs' and times 
         /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="ops">sets of medium optical properties </param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="zs">z values (mm)</param>
-        /// <returns>Fluence as a function of rhos and zs</returns>
-        IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs);
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of rhos and zs</returns>
+        double[] FluenceOfRhoAndZAndTime(OpticalProperties[] ops, double[] rhos, double[] zs, double[] times);
 
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and times 
-        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
-        /// and so-on such that the right-most input is at the inner-most loop
+        /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops',
+        /// source-detector separations 'rhos' and times 
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
+        /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="zs">z values (mm)</param>
         /// <param name="times">times (ns)</param>
         /// <returns>Fluence as a function of rhos, zs and times</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions)
+        /// on single items</remarks>
         IEnumerable<double> FluenceOfRhoAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> times);
+        #endregion
 
+        #region FluenceOfRhoAndZAndFt
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndFt function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos' and time frequencies 'fts'
-        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
-        /// and so-on such that the right-most input is at the inner-most loop
+        /// Overload of scalar FluenceOfRhoAndZAndFt function. Determines reflectance at optical properties 'ops',
+        /// source-detector separations 'rhos', z values 'zs' and modulation frequencies 'fts'
         /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="ops">sets of medium optical properties </param>
         /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="zs">z values (mm)</param>
         /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Fluence as a function of rhos, zs and fts</returns>
-        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions) on single items</remarks>
-        IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
-
-
-        /// <summary>
-        /// Overload of scalar FluenceOfFxAndZ function. Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
-        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
-        /// and so-on such that the right-most input is at the inner-most loop
-        /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="zs">z values (mm)</param>
-        /// <returns>Fluence as a function of fxs and zs</returns>
-        IEnumerable<double> FluenceOfFxAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs);
-
+        /// <returns>Reflectance as a function of rhos, zs and fts</returns>
+        Complex[] FluenceOfRhoAndZAndFt(OpticalProperties[] ops, double[] rhos, double[] zs, double[] fts);
 
         /// <summary>
-        /// Overload of scalar FluenceOfFxAndZAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and times 
-        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
-        /// and so-on such that the right-most input is at the inner-most loop
+        /// Overload of scalar FluenceOfRhoAndZAndFt function. Determines reflectance at optical properties 'ops',
+        /// source-detector separations 'rhos' and time frequencies 'fts'
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
+        /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="rhos">source-detector separations (mm)</param>
         /// <param name="zs">z values (mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Fluence as a function of fxs, zs and times</returns>
-        IEnumerable<double> FluenceOfFxAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> times);
-
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Fluence as a function of rhos, zs and fts</returns>
+        /// <remarks>IEnumerable can be one or more values - use the .AsEnumerable() extension method (in Vts.Extensions)
+        /// on single items</remarks>
+        IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
 
         /// <summary>
-        /// Overload of scalar FluenceOfFxAndZAndFt function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and time frequencies 'fts'
-        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt; input being the top-level,
-        /// and so-on such that the right-most input is at the inner-most loop
+        ///  Overload of scalar FluenceOfRhoAndZAndFt function. Determines fluence of tissue 'regions' and
+        /// source-detector separations 'rhos' and 'zs' at temporal frequencies fts
         /// </summary>
-        /// <param name="ops">sets of medium optical properties</param>
-        /// <param name="fxs">spatial frequencies (1/mm)</param>
-        /// <param name="zs">z values (mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Fluence as a function of fxs, zs and fts</returns>
-        IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> fts);
+        /// <param name="regions">tissue regions</param>
+        /// <param name="rhos">source-detector separations</param>
+        /// <param name="zs">depth bins</param>
+        /// <param name="fts">temporal frequencies</param>
+        /// <returns>Fluence as a function of rhos, zs and fts</returns>
+        IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
 
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence at optical properties 'ops' and source-detector separations 'rhos' and 'zs'
+        /// Overload of scalar FluenceOfRhoAndZAndFt function. Determines fluence of tissue 'regions' and
+        /// source-detector separations 'rhos' and 'zs' at temporal frequencies fts
         /// </summary>
-        /// <param name="ops">sets of medium optical properties </param>
-        /// <param name="rhos">source-detector separations (mm)</param>
-        /// <param name="zs">z values (mm)</param>
-        /// <returns>Reflectance as a function of rhos and zs</returns>
-        double[] FluenceOfRhoAndZ(OpticalProperties[] ops, double[] rhos, double[] zs);
+        /// <param name="regions">tissue regions</param>
+        /// <param name="rhos">source-detector separations</param>
+        /// <param name="zs">depth bins</param>
+        /// <param name="fts">temporal frequencies</param>
+        /// <returns>Fluence as a function of rhos, zs and fts</returns>
+        Complex[] FluenceOfRhoAndZAndFt(IOpticalPropertyRegion[][] regions, double[] rhos, double[] zs, double[] fts);
+        #endregion
 
+        #region FluenceOfFxAndZ
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos', z values 'zs' and times 
+        /// Overload of scalar FluenceOfFxAndZ function. Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and z values 'zs'
         /// </summary>
-        /// <param name="ops">sets of medium optical properties </param>
-        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
         /// <param name="zs">z values (mm)</param>
-        /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of rhos and zs</returns>
-        double[] FluenceOfRhoAndZAndTime(OpticalProperties[] ops, double[] rhos, double[] zs, double[] times);
+        /// <returns>Reflectance as a function of fxs and zs</returns>
+        double[] FluenceOfFxAndZ(OpticalProperties[] ops, double[] fxs, double[] zs);
 
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops', source-detector separations 'rhos', z values 'zs' and modulation frequencies 'fts'
+        /// Overload of scalar FluenceOfFxAndZ function. Determines reflectance at optical properties 'ops'
+        /// and spatial frequencies 'fxs'
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
+        /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>
-        /// <param name="ops">sets of medium optical properties </param>
-        /// <param name="rhos">source-detector separations (mm)</param>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
         /// <param name="zs">z values (mm)</param>
-        /// <param name="fts">modulation frequencies (GHz)</param>
-        /// <returns>Reflectance as a function of rhos, zs and fts</returns>
-        Complex[] FluenceOfRhoAndZAndFt(OpticalProperties[] ops, double[] rhos, double[] zs, double[] fts);
+        /// <returns>Fluence as a function of fxs and zs</returns>
+        IEnumerable<double> FluenceOfFxAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs);
+        #endregion
 
+        #region FluenceOfFxAndZAndTime
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs' and z values 'zs'
+        /// Overload of scalar FluenceOfFxAndZAndTime function. Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs', z values 'zs' and times 
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
         /// <param name="zs">z values (mm)</param>
-        /// <returns>Reflectance as a function of fxs and zs</returns>
-        double[] FluenceOfFxAndZ(OpticalProperties[] ops, double[] fxs, double[] zs);
+        /// <param name="times">times (ns)</param>
+        /// <returns>Reflectance as a function of fxs, zs and times</returns>
+        double[] FluenceOfFxAndZAndTime(OpticalProperties[] ops, double[] fxs, double[] zs, double[] times);
 
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs', z values 'zs' and times 
+        /// Overload of scalar FluenceOfFxAndZAndTime function. Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and times 
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
+        /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
         /// <param name="zs">z values (mm)</param>
         /// <param name="times">times (ns)</param>
-        /// <returns>Reflectance as a function of fxs, zs and times</returns>
-        double[] FluenceOfFxAndZAndTime(OpticalProperties[] ops, double[] fxs, double[] zs, double[] times);
+        /// <returns>Fluence as a function of fxs, zs and times</returns>
+        IEnumerable<double> FluenceOfFxAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> times);
+        #endregion
 
+        #region FluenceOfFxAndZAndFt
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops', spatial frequencies 'fxs', z values 'zs' and modulation frequencies 'fts'
+        /// Overload of scalar FluenceOfFxAndZAndFt function. Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs', z values 'zs' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fx">spatial frequencies (1/mm)</param>
@@ -911,5 +969,19 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         /// <param name="fts">modulation frequencies (GHz)</param>
         /// <returns>Reflectance as a function of fx, zs and fts</returns>
         Complex[] FluenceOfFxAndZAndFt(OpticalProperties[] ops, double[] fx, double[] zs, double[] fts);
+
+        /// <summary>
+        /// Overload of scalar FluenceOfFxAndZAndFt function. Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and time frequencies 'fts'
+        /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
+        /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
+        /// </summary>
+        /// <param name="ops">sets of medium optical properties</param>
+        /// <param name="fxs">spatial frequencies (1/mm)</param>
+        /// <param name="zs">z values (mm)</param>
+        /// <param name="fts">modulation frequencies (GHz)</param>
+        /// <returns>Fluence as a function of fxs, zs and fts</returns>
+        IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> fts);
+        #endregion
     }
 }

From edac64aee888e75fd48192294a0513218726154b Mon Sep 17 00:00:00 2001
From: Lisa Malenfant <lisa.malenfant@uci.edu>
Date: Fri, 29 Sep 2023 16:31:10 -0700
Subject: [PATCH 7/9] Reorder the methods to match IForwardSolver

---
 .../MonteCarlo/Demo07pMCInversion.cs          | 193 +++++++++---------
 1 file changed, 95 insertions(+), 98 deletions(-)

diff --git a/src/Vts.Scripting/MonteCarlo/Demo07pMCInversion.cs b/src/Vts.Scripting/MonteCarlo/Demo07pMCInversion.cs
index edfd1717f..d72d907a6 100644
--- a/src/Vts.Scripting/MonteCarlo/Demo07pMCInversion.cs
+++ b/src/Vts.Scripting/MonteCarlo/Demo07pMCInversion.cs
@@ -193,472 +193,469 @@ public double[] ROfRho(OpticalProperties[] ops, double[] rhos)
             return ops.SelectMany(op => ROfRho(op, rhos)).ToArray();   
         }
 
-        #region not implemented
-        public double BeamDiameter { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-
-        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
-
-        public double ROfRho(IOpticalPropertyRegion[] regions, double rho)
+        #region Not Implemented
+        public double ROfRho(OpticalProperties op, double rho)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> ROfRho(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos)
+        public double[] ROfRho(OpticalProperties[] ops, double rho)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRho(IOpticalPropertyRegion[] regions, double[] rhos)
+        public IEnumerable<double> ROfRho(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRho(IOpticalPropertyRegion[][] regions, double[] rhos)
+        public double ROfRho(IOpticalPropertyRegion[] regions, double rho)
         {
             throw new NotImplementedException();
         }
 
-        public double ROfRhoAndTime(IOpticalPropertyRegion[] regions, double rho, double time)
+        public double[] ROfRho(IOpticalPropertyRegion[] regions, double[] rhos)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> times)
+        public IEnumerable<double> ROfRho(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double[] rhos, double[] times)
+        public double[] ROfRho(IOpticalPropertyRegion[][] regions, double[] rhos)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double[] rhos, double time)
+        public double ROfRhoAndTime(OpticalProperties op, double rho, double time)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double rho, double[] times)
+        public double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(IOpticalPropertyRegion[][] regions, double[] rhos, double[] times)
+        public double[] ROfRhoAndTime(OpticalProperties op, double rho, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public Complex ROfRhoAndFt(IOpticalPropertyRegion[] regions, double rho, double ft)
+        public double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double time)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<Complex> ROfRhoAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> fts)
+        public double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double time)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double rho, double[] fts)
+        public double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double time)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double ft)
+        public double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double[] fts)
+        public double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(IOpticalPropertyRegion[][] regions, double[] rhos, double[] fts)
+        public IEnumerable<double> ROfRhoAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> times)
         {
             throw new NotImplementedException();
         }
 
-        public double ROfFx(IOpticalPropertyRegion[] regions, double fx)
+        public double ROfRhoAndTime(IOpticalPropertyRegion[] regions, double rho, double time)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> ROfFx(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs)
+        public double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double[] rhos, double time)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFx(IOpticalPropertyRegion[] regions, double[] fxs)
+        public double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double rho, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFx(IOpticalPropertyRegion[][] regions, double[] fxs)
+        public double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double[] rhos, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public double ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double time)
+        public IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> times)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs, IEnumerable<double> times)
+        public double[] ROfRhoAndTime(IOpticalPropertyRegion[][] regions, double[] rhos, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double[] times)
+        public Complex ROfRhoAndFt(OpticalProperties op, double rho, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double[] times)
+        public Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double time)
+        public Complex[] ROfRhoAndFt(OpticalProperties op, double rho, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(IOpticalPropertyRegion[][] regions, double[] fxs, double[] times)
+        public Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex ROfFxAndFt(IOpticalPropertyRegion[] regions, double fx, double ft)
+        public Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<Complex> ROfFxAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs, IEnumerable<double> fts)
+        public Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double fx, double[] fts)
+        public Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double[] fxs, double ft)
+        public Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double[] fxs, double[] fts)
+        public IEnumerable<Complex> ROfRhoAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(IOpticalPropertyRegion[][] regions, double[] fxs, double[] fts)
+        public Complex ROfRhoAndFt(IOpticalPropertyRegion[] regions, double rho, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public double[] FluenceOfRhoAndZ(IOpticalPropertyRegion[][] regions, double[] rhos, double[] zs)
+        public Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs)
+        public Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double rho, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] FluenceOfRhoAndZAndFt(IOpticalPropertyRegion[][] regions, double[] rhos, double[] zs, double[] fts)
+        public Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts)
+        public IEnumerable<Complex> ROfRhoAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> fts)
         {
             throw new NotImplementedException();
         }
 
-        public double ROfRho(OpticalProperties op, double rho)
+        public Complex[] ROfRhoAndFt(IOpticalPropertyRegion[][] regions, double[] rhos, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public double ROfRhoAndTime(OpticalProperties op, double rho, double time)
+        public double ROfFx(OpticalProperties op, double fx)
         {
             throw new NotImplementedException();
         }
 
-        public Complex ROfRhoAndFt(OpticalProperties op, double rho, double ft)
+        public double[] ROfFx(OpticalProperties op, double[] fxs)
         {
             throw new NotImplementedException();
         }
 
-        public double ROfFx(OpticalProperties op, double fx)
+        public double[] ROfFx(OpticalProperties[] ops, double fx)
         {
             throw new NotImplementedException();
         }
 
-        public double ROfFxAndTime(OpticalProperties op, double fx, double time)
+        public double[] ROfFx(OpticalProperties[] ops, double[] fxs)
         {
             throw new NotImplementedException();
         }
 
-        public Complex ROfFxAndFt(OpticalProperties op, double fx, double ft)
+        public IEnumerable<double> ROfFx(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs)
+        public double ROfFx(IOpticalPropertyRegion[] regions, double fx)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> FluenceOfRhoAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> times)
+        public double[] ROfFx(IOpticalPropertyRegion[] regions, double[] fxs)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts)
+        public IEnumerable<double> ROfFx(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> FluenceOfFxAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs)
+        public double[] ROfFx(IOpticalPropertyRegion[][] regions, double[] fxs)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> FluenceOfFxAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> times)
+        public double ROfFxAndTime(OpticalProperties op, double fx, double time)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> fts)
+        public double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double time)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> ROfRho(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos)
+        public double[] ROfFxAndTime(OpticalProperties op, double fx, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> ROfRhoAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> times)
+        public double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<Complex> ROfRhoAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> fts)
+        public double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double time)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> ROfFx(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs)
+        public double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double time)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<double> ROfFxAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> times)
+        public double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public IEnumerable<Complex> ROfFxAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> fts)
+        public double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double[] times)
+        public IEnumerable<double> ROfFxAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double[] times)
+        public double ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double time)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double[] fts)
+        public double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double time)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double[] fts)
+        public double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFx(OpticalProperties op, double[] fxs)
+        public double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFx(OpticalProperties[] ops, double[] fxs)
+        public IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs, IEnumerable<double> times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double[] times)
+        public double[] ROfFxAndTime(IOpticalPropertyRegion[][] regions, double[] fxs, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double[] times)
+        public Complex ROfFxAndFt(OpticalProperties op, double fx, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double[] fts)
+        public Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double[] fts)
+        public Complex[] ROfFxAndFt(OpticalProperties op, double fx, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRho(OpticalProperties[] ops, double rho)
+        public Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double[] times)
+        public Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double time)
+        public Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(OpticalProperties op, double rho, double[] times)
+        public Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double time)
+        public Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double time)
+        public IEnumerable<Complex> ROfFxAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double[] fts)
+        public Complex ROfFxAndFt(IOpticalPropertyRegion[] regions, double fx, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double ft)
+        public Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double[] fxs, double ft)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(OpticalProperties op, double rho, double[] fts)
+        public Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double fx, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double ft)
+        public Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double[] fxs, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double ft)
+        public IEnumerable<Complex> ROfFxAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs, IEnumerable<double> fts)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFx(OpticalProperties[] ops, double fx)
+        public Complex[] ROfFxAndFt(IOpticalPropertyRegion[][] regions, double[] fxs, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double[] times)
+        public double[] FluenceOfRhoAndZ(OpticalProperties[] ops, double[] rhos, double[] zs)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double time)
+        public IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(OpticalProperties op, double fx, double[] times)
+        public IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double time)
+        public double[] FluenceOfRhoAndZ(IOpticalPropertyRegion[][] regions, double[] rhos, double[] zs)
         {
             throw new NotImplementedException();
         }
 
-        public double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double time)
+        public double[] FluenceOfRhoAndZAndTime(OpticalProperties[] ops, double[] rhos, double[] zs, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double[] fts)
+        public IEnumerable<double> FluenceOfRhoAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> times)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double ft)
+        public Complex[] FluenceOfRhoAndZAndFt(OpticalProperties[] ops, double[] rhos, double[] zs, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(OpticalProperties op, double fx, double[] fts)
+        public IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double ft)
+        public IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double ft)
+        public Complex[] FluenceOfRhoAndZAndFt(IOpticalPropertyRegion[][] regions, double[] rhos, double[] zs, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public double[] FluenceOfRhoAndZ(OpticalProperties[] ops, double[] rhos, double[] zs)
+        public double[] FluenceOfFxAndZ(OpticalProperties[] ops, double[] fxs, double[] zs)
         {
             throw new NotImplementedException();
         }
 
-        public double[] FluenceOfRhoAndZAndTime(OpticalProperties[] ops, double[] rhos, double[] zs, double[] times)
+        public IEnumerable<double> FluenceOfFxAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] FluenceOfRhoAndZAndFt(OpticalProperties[] ops, double[] rhos, double[] zs, double[] fts)
+        public double[] FluenceOfFxAndZAndTime(OpticalProperties[] ops, double[] fxs, double[] zs, double[] times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] FluenceOfFxAndZ(OpticalProperties[] ops, double[] fxs, double[] zs)
+        public IEnumerable<double> FluenceOfFxAndZAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> times)
         {
             throw new NotImplementedException();
         }
 
-        public double[] FluenceOfFxAndZAndTime(OpticalProperties[] ops, double[] fxs, double[] zs, double[] times)
+        public Complex[] FluenceOfFxAndZAndFt(OpticalProperties[] ops, double[] fx, double[] zs, double[] fts)
         {
             throw new NotImplementedException();
         }
 
-        public Complex[] FluenceOfFxAndZAndFt(OpticalProperties[] ops, double[] fx, double[] zs, double[] fts)
+        public IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> zs, IEnumerable<double> fts)
         {
             throw new NotImplementedException();
         }
+        public double BeamDiameter { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
-
+        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
         #endregion
     }
 }
\ No newline at end of file

From 31781d0bb871e06f07ee2cfda1cf8e367b0230f8 Mon Sep 17 00:00:00 2001
From: Lisa Malenfant <lisa.malenfant@uci.edu>
Date: Wed, 4 Oct 2023 20:32:09 -0700
Subject: [PATCH 8/9] Fixed the XML comments for the different overloads

---
 src/Vts/Interfaces/IForwardSolver.cs | 298 ++++++++++++++-------------
 1 file changed, 150 insertions(+), 148 deletions(-)

diff --git a/src/Vts/Interfaces/IForwardSolver.cs b/src/Vts/Interfaces/IForwardSolver.cs
index a1b7a0a2e..53855f0b1 100644
--- a/src/Vts/Interfaces/IForwardSolver.cs
+++ b/src/Vts/Interfaces/IForwardSolver.cs
@@ -16,7 +16,8 @@ public interface IForwardSolver : INotifyPropertyChanged
 
         #region ROfRho
         /// <summary>
-        /// Determines reflectance at source-detector separation rho
+        /// Determines reflectance at optical properties 'op' and
+        /// source-detector separation 'rho'
         /// </summary>
         /// <param name="op">optical properties of the medium</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -24,7 +25,7 @@ public interface IForwardSolver : INotifyPropertyChanged
         double ROfRho(OpticalProperties op, double rho);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'op' and
+        /// Determines reflectance at optical properties 'op' and
         /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="op">medium optical properties</param>
@@ -33,7 +34,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRho(OpticalProperties op, double[] rhos);
 
         /// <summary>
-        /// Overload of ROfRho. Determines reflectance at optical properties 'ops', and source-detector separation 'rho'
+        /// Determines reflectance at optical properties 'ops' and
+        /// source-detector separation 'rho'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -41,7 +43,7 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRho(OpticalProperties[] ops, double rho);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'ops' and
+        /// Determines reflectance at optical properties 'ops' and
         /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
@@ -50,7 +52,7 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRho(OpticalProperties[] ops, double[] rhos);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at optical properties 'ops' and
+        /// Determines reflectance at optical properties 'ops' and
         /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
@@ -59,7 +61,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         IEnumerable<double> ROfRho(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos);
 
         /// <summary>
-        /// Determines reflectance at source-detector separation rho
+        /// Determines reflectance at given tissue regions 'regions' and
+        /// source-detector separation 'rho'
         /// </summary>
         /// <param name="regions">optical and geometrical properties of the medium for each sub-region</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -67,7 +70,7 @@ public interface IForwardSolver : INotifyPropertyChanged
         double ROfRho(IOpticalPropertyRegion[] regions, double rho);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions and
+        /// Determines reflectance at given tissue regions 'regions' and
         /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
@@ -76,7 +79,7 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRho(IOpticalPropertyRegion[] regions, double[] rhos);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions and
+        /// Determines reflectance at given tissue regions 'regions' and
         /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
@@ -85,7 +88,7 @@ public interface IForwardSolver : INotifyPropertyChanged
         IEnumerable<double> ROfRho(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions and
+        /// Determines reflectance at given tissue regions 'regions' and
         /// source-detector separations 'rhos'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
@@ -96,7 +99,8 @@ public interface IForwardSolver : INotifyPropertyChanged
 
         #region ROfRhoAndTime
         /// <summary>
-        /// Determines reflectance at source-detector separation rho and time
+        /// Determines reflectance at optical properties 'op',
+        /// source-detector separation 'rho' and time 'time'
         /// </summary>
         /// <param name="op">optical properties of the medium</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -105,8 +109,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double ROfRhoAndTime(OpticalProperties op, double rho, double time);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'op',
-        /// source-detector separations 'rhos' and times 
+        /// Determines reflectance at optical properties 'op',
+        /// source-detector separations 'rhos' and times 'times'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -117,8 +121,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double[] times);
 
         /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'op', source-detector
-        /// separation 'rho' and times 
+        /// Determines reflectance at optical properties 'op', source-detector
+        /// separation 'rho' and times 'times'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -127,8 +131,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties op, double rho, double[] times);
 
         /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'op', source-detector
-        /// separations 'rhos' and time 't'
+        /// Determines reflectance at optical properties 'op',
+        /// source-detector separations 'rhos' and time 'time'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="rhos">source-detector separation (mm)</param>
@@ -137,8 +141,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties op, double[] rhos, double time);
 
         /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector
-        /// separation 'rho' and times 't'
+        /// Determines reflectance at optical properties 'ops',
+        /// source-detector separation 'rho' and time 'time'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -147,8 +151,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double time);
 
         /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector
-        /// separations 'rhos' and time
+        /// Determines reflectance at optical properties 'ops',
+        /// source-detector separations 'rhos' and time 'time'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -157,8 +161,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double time);
 
         /// <summary>
-        /// Overload of ROfRhoAndTime. Determines reflectance at optical properties 'ops', source-detector
-        /// separation 'rho' and times 
+        /// Determines reflectance at optical properties 'ops',
+        /// source-detector separation 'rho' and times 'times'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -167,7 +171,7 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties[] ops, double rho, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'ops',
+        /// Determines reflectance at optical properties 'ops',
         /// source-detector separations 'rhos' and times 
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
@@ -179,8 +183,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(OpticalProperties[] ops, double[] rhos, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndTime function. Determines reflectance at optical properties 'ops',
-        /// source-detector separations 'rhos' and times 
+        /// Determines reflectance at optical properties 'ops',
+        /// source-detector separations 'rhos' and times 'times'
         /// </summary>
         /// <param name="ops">sets of medium optical properties </param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -191,7 +195,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         IEnumerable<double> ROfRhoAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> times);
 
         /// <summary>
-        /// Determines reflectance at source-detector separation rho and time
+        /// Determines reflectance at given tissue regions 'regions',
+        /// source-detector separation 'rho' and time 'time'
         /// </summary>
         /// <param name="regions">optical and geometrical properties of the medium for each sub-region</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -200,8 +205,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double ROfRhoAndTime(IOpticalPropertyRegion[] regions, double rho, double time);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
-        /// separations 'rhos', and time 'time'
+        /// Determines reflectance at given tissue regions 'regions',
+        /// source-detector separations 'rhos', and time 'time'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -210,8 +215,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double[] rhos, double time);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
-        /// separation 'rho', and times 'times'
+        /// Determines reflectance at given tissue regions 'regions',
+        /// source-detector separation 'rho', and times 'times'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rho">source-detector separations (mm)</param>
@@ -220,8 +225,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double rho, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
-        /// separations 'rhos', and times 'times'
+        /// Determines reflectance at given tissue regions 'regions',
+        /// source-detector separations 'rhos', and times 'times'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -230,8 +235,8 @@ public interface IForwardSolver : INotifyPropertyChanged
         double[] ROfRhoAndTime(IOpticalPropertyRegion[] regions, double[] rhos, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance at tissue regions, source-detector 
-        /// separations 'rhos', and times 'times'
+        /// Determines reflectance at given tissue regions 'regions',
+        /// source-detector separations 'rhos', and times 'times'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -241,8 +246,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
             IEnumerable<double> times);
 
         /// <summary>
-        /// Overload of scalar ROfRho function. Determines reflectance given tissue regions, source-detector 
-        /// separations 'rhos', and times 'times'
+        /// Determines reflectance at given tissue regions 'regions',
+        /// source-detector separations 'rhos', and times 'times'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -253,7 +258,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
 
         #region ROfRhoAndFt
         /// <summary>
-        /// Determines reflectance at source-detector separation rho and modulation frequency ft
+        /// Determines reflectance at optical properties 'op',
+        /// source-detector separation 'rho' and modulation frequency 'ft'
         /// </summary>
         /// <param name="op">optical properties of the medium</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -262,7 +268,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex ROfRhoAndFt(OpticalProperties op, double rho, double ft);
 
         /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'op', source-detector
+        /// Determines reflectance at optical properties 'op', source-detector
         /// separations 'rhos' and modulation frequency 'ft'
         /// </summary>
         /// <param name="op">medium optical properties</param>
@@ -272,7 +278,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double ft);
 
         /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'op', source-detector
+        /// Determines reflectance at optical properties 'op', source-detector
         /// separation 'rho' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="op">medium optical properties</param>
@@ -282,8 +288,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties op, double rho, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'op',
-        /// source-detector separations 'rhos' and time frequencies 'fts'
+        /// Determines reflectance at optical properties 'op', source-detector
+        /// separations 'rhos' and time frequencies 'fts'
         /// </summary>
         /// <param name="op">optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -294,8 +300,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties op, double[] rhos, double[] fts);
 
         /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector separation
-        /// 'rho' and modulation frequency 'ft'
+        /// Determines reflectance at optical properties 'ops', source-detector
+        /// separation 'rho' and modulation frequency 'ft'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -304,7 +310,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double ft);
 
         /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector
+        /// Determines reflectance at optical properties 'ops', source-detector
         /// separations 'rhos' and modulation frequency 'ft'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
@@ -314,7 +320,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double ft);
 
         /// <summary>
-        /// Overload of ROfRhoAndFt. Determines reflectance at optical properties 'ops', source-detector
+        /// Determines reflectance at optical properties 'ops', source-detector
         /// separation 'rho' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
@@ -324,8 +330,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties[] ops, double rho, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops',
-        /// source-detector separations 'rhos' and time frequencies 'fts'
+        /// Determines reflectance at optical properties 'ops', source-detector
+        /// separations 'rhos' and time frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -336,8 +342,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(OpticalProperties[] ops, double[] rhos, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at optical properties 'ops',
-        /// source-detector separations 'rhos' and time frequencies 'fts'
+        /// Determines reflectance at optical properties 'ops', source-detector
+        /// separations 'rhos' and time frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -348,7 +354,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<Complex> ROfRhoAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> fts);
 
         /// <summary>
-        /// Determines reflectance at source-detector separation rho and temporal frequency ft
+        /// Determines reflectance at tissue regions 'regions', source-detector
+        /// separation 'rho' and temporal frequency 'ft'
         /// </summary>
         /// <param name="regions">optical and geometrical properties of the medium for each sub-region</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -357,8 +364,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex ROfRhoAndFt(IOpticalPropertyRegion[] regions, double rho, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance given tissue regions, source-detector 
-        /// separations 'rhos' and temporal frequencies fts
+        /// Determines reflectance at given tissue regions 'regions', source-detector 
+        /// separations 'rhos' and temporal frequency 'ft'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separation (mm)</param>
@@ -367,8 +374,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance given tissue regions, source-detector 
-        /// separations 'rhos' and temporal frequencies fts
+        /// Determines reflectance at given tissue regions 'regions', source-detector 
+        /// separation 'rho' and temporal frequencies 'fts'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rho">source-detector separation (mm)</param>
@@ -377,8 +384,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double rho, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance given tissue regions, source-detector 
-        /// separations 'rhos' and temporal frequencies fts
+        /// Determines reflectance at given tissue regions 'regions', source-detector 
+        /// separations 'rhos' and temporal frequencies 'fts'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -387,8 +394,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfRhoAndFt(IOpticalPropertyRegion[] regions, double[] rhos, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance at tissue regions, source-detector 
-        /// separations 'rhos' and temporal frequencies fts
+        /// Determines reflectance at tissue regions 'regions', source-detector 
+        /// separations 'rhos' and temporal frequencies 'fts'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -397,8 +404,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<Complex> ROfRhoAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> fts);
 
         /// <summary>
-        /// Overload of scalar ROfRhoAndFt function. Determines reflectance given tissue regions, source-detector 
-        /// separations 'rhos', and temporal frequencies fts
+        /// Determines reflectance at given tissue regions 'regions', source-detector 
+        /// separations 'rhos', and temporal frequencies 'fts'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -409,7 +416,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
 
         #region ROfFx
         /// <summary>
-        /// Determines reflectance at spatial frequency fx
+        /// Determines reflectance at optical properties 'op' and spatial frequency 'fx'
         /// </summary>
         /// <param name="op">optical properties of the medium</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -417,7 +424,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double ROfFx(OpticalProperties op, double fx);
 
         /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'op' and spatial frequencies 'fxs'
+        /// Determines reflectance at optical properties 'op' and spatial frequencies 'fxs'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -425,7 +432,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFx(OpticalProperties op, double[] fxs);
 
         /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops' and spatial frequency 'fx'
+        /// Determines reflectance at optical properties 'ops' and spatial frequency 'fx'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -433,8 +440,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFx(OpticalProperties[] ops, double fx);
 
         /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops'
-        /// and spatial frequencies 'fxs'
+        /// Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -442,8 +448,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFx(OpticalProperties[] ops, double[] fxs);
 
         /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at optical properties 'ops'
-        /// and spatial frequencies 'fxs'
+        /// Determines reflectance at optical properties 'ops' and spatial frequencies 'fxs'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -451,7 +456,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<double> ROfFx(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs);
 
         /// <summary>
-        /// Determines reflectance at spatial frequency 
+        /// Determines reflectance at given tissue regions 'regions' and spatial frequency 'fx'
         /// </summary>
         /// <param name="regions">optical and geometrical properties of the medium for each sub-region</param>
         /// <param name="fx">spatial frequency</param>
@@ -459,8 +464,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double ROfFx(IOpticalPropertyRegion[] regions, double fx);
 
         /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance given tissue regions
-        /// and spatial frequencies 'fxs'
+        /// Determines reflectance at given tissue regions 'regions' and spatial frequencies 'fxs'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -468,8 +472,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFx(IOpticalPropertyRegion[] regions, double[] fxs);
 
         /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance at tissue regions
-        /// and source-detector separations 'rhos'
+        /// Determines reflectance at given tissue regions 'regions' and spatial frequencies 'fxs'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -477,7 +480,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<double> ROfFx(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs);
 
         /// <summary>
-        /// Overload of scalar ROfFx function. Determines reflectance given tissue regions and spatial frequencies 'fxs'
+        /// Determines reflectance at given tissue regions 'regions' and spatial frequencies 'fxs'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -487,7 +490,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
 
         #region ROfFxAndTime
         /// <summary>
-        /// Determines reflectance at spatial frequency fx and time
+        /// Determines reflectance at optical properties 'op', spatial frequency 'fx' and time 'time'
         /// </summary>
         /// <param name="op">optical properties of the medium</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -496,8 +499,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double ROfFxAndTime(OpticalProperties op, double fx, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op',
-        /// spatial frequencies 'fxs' and time 't'
+        /// Determines reflectance at optical properties 'op',
+        /// spatial frequencies 'fxs' and time 'time'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="fxs">spatial frequency (1/mm)</param>
@@ -506,8 +509,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op',
-        /// spatial frequency 'fx' and times 
+        /// Determines reflectance at optical properties 'op',
+        /// spatial frequency 'fx' and times 'times'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -516,8 +519,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties op, double fx, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'op',
-        /// spatial frequencies 'fxs' and times 
+        /// Determines reflectance at optical properties 'op',
+        /// spatial frequencies 'fxs' and times 'times'
         /// </summary>
         /// <param name="op">medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -526,8 +529,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties op, double[] fxs, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops',
-        /// spatial frequency 'fx' and time 't'
+        /// Determines reflectance at optical properties 'ops',
+        /// spatial frequency 'fx' and time 'time'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -536,8 +539,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops',
-        /// spatial frequencies 'fxs' and time 
+        /// Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and time 'time'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -546,8 +549,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops',
-        /// spatial frequency 'fx' and times 
+        /// Determines reflectance at optical properties 'ops',
+        /// spatial frequency 'fx' and times 'times'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -556,8 +559,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties[] ops, double fx, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops',
-        /// spatial frequencies 'fxs' and times 
+        /// Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and times 'times'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -566,8 +569,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(OpticalProperties[] ops, double[] fxs, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance at optical properties 'ops',
-        /// spatial frequencies 'fxs' and times 
+        /// Determines reflectance at optical properties 'ops',
+        /// spatial frequencies 'fxs' and times 'times'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -576,7 +579,8 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<double> ROfFxAndTime(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> times);
 
         /// <summary>
-        /// Determines reflectance at spatial frequency and time
+        /// Determines reflectance at given tissue regions 'regions',
+        /// spatial frequency 'fx' and time 'time'
         /// </summary>
         /// <param name="regions">optical and geometrical properties of the medium for each sub-region</param>
         /// <param name="fx">spatial frequency</param>
@@ -585,7 +589,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function.  Determines reflectance given tissue regions,
+        /// Determines reflectance at given tissue regions 'regions',
         /// spatial frequencies 'fxs', and time 'time'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
@@ -595,7 +599,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double time);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions,
+        /// Determines reflectance at given tissue regions 'regions',
         /// spatial frequency 'fx', and times 'times'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
@@ -605,7 +609,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double fx, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions,
+        /// Determines reflectance at given tissue regions 'regions',
         /// spatial frequencies 'fxs', and times 'times'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
@@ -615,7 +619,7 @@ IEnumerable<double> ROfRhoAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] ROfFxAndTime(IOpticalPropertyRegion[] regions, double[] fxs, double[] times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTim function. Determines reflectance at tissue regions,
+        /// Determines reflectance at given tissue regions 'regions',
         /// spatial frequencies 'fxs', and times 'times'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
@@ -626,7 +630,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
             IEnumerable<double> times);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndTime function. Determines reflectance given tissue regions,
+        /// Determines reflectance given tissue regions 'regions',
         /// spatial frequencies 'fxs', and times 'times'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
@@ -638,7 +642,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
 
         #region ROfFxAndFt
         /// <summary>
-        /// Determines reflectance at spatial frequency fx and modulation frequency ft
+        /// Determines reflectance at optical properties 'op',
+        /// spatial frequency 'fx' and modulation frequency 'ft'
         /// </summary>
         /// <param name="op">optical properties of the medium</param>
         /// <param name="fx">spatial frequency (1/mm)</param>
@@ -647,7 +652,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex ROfFxAndFt(OpticalProperties op, double fx, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op',
+        /// Determines reflectance at optical properties 'op',
         /// spatial frequency 'fxs' and modulation frequency 'ft'
         /// </summary>
         /// <param name="op">medium optical properties</param>
@@ -657,7 +662,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op',
+        /// Determines reflectance at optical properties 'op',
         /// spatial frequency 'fx' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="op">medium optical properties</param>
@@ -667,7 +672,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties op, double fx, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'op',
+        /// Determines reflectance at optical properties 'op',
         /// spatial frequencies 'fxs' and time frequencies 'fts'
         /// </summary>
         /// <param name="op">medium optical properties</param>
@@ -677,7 +682,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties op, double[] fxs, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops',
+        /// Determines reflectance at optical properties 'ops',
         /// spatial frequency 'fx' and modulation frequencies 'ft'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
@@ -687,7 +692,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops',
+        /// Determines reflectance at optical properties 'ops',
         /// spatial frequency 'fxs' and modulation frequency 'ft'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
@@ -697,7 +702,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops',
+        /// Determines reflectance at optical properties 'ops',
         /// spatial frequency 'fx' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
@@ -707,7 +712,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double fx, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops',
+        /// Determines reflectance at optical properties 'ops',
         /// spatial frequencies 'fxs' and time frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
@@ -717,7 +722,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(OpticalProperties[] ops, double[] fxs, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at optical properties 'ops',
+        /// Determines reflectance at optical properties 'ops',
         /// spatial frequencies 'fxs' and time frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
@@ -727,7 +732,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<Complex> ROfFxAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> fxs, IEnumerable<double> fts);
 
         /// <summary>
-        /// Determines reflectance at spatial frequency fx and temporal frequency ft
+        /// Determines reflectance at given tissue regions 'regions',
+        /// spatial frequency 'fx' and temporal frequency 'ft'
         /// </summary>
         /// <param name="regions">optical and geometrical properties of the medium for each sub-region</param>
         /// <param name="fx">spatial frequency</param>
@@ -736,8 +742,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex ROfFxAndFt(IOpticalPropertyRegion[] regions, double fx, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance given tissue regions, spatial frequencies 
-        /// 'fs' and temporal frequencies fts
+        /// Determines reflectance at given tissue regions 'regions',
+        /// spatial frequencies 'fxs' and temporal frequency 'ft'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -746,8 +752,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double[] fxs, double ft);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance given tissue regions, source-detector 
-        /// separations 'rhos' and temporal frequencies fts
+        /// Determines reflectance at given tissue regions 'regions',
+        /// spatial frequency 'fx' and temporal frequencies 'fts'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fx">spatial-frequency</param>
@@ -756,8 +762,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double fx, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance given tissue regions, spatial 
-        /// frequencies 'fxs' and temporal frequencies fts
+        ///Determines reflectance at given tissue regions 'regions',
+        /// spatial frequencies 'fxs' and temporal frequencies 'fts'
         /// </summary>
         /// <param name="regions">medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -766,8 +772,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] ROfFxAndFt(IOpticalPropertyRegion[] regions, double[] fxs, double[] fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance at tissue regions, spatial frequencies 'fxs' and 
-        /// temporal frequencies fts
+        /// Determines reflectance at tissue regions 'regions',
+        /// spatial frequencies 'fxs' and temporal frequencies 'fts'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -776,8 +782,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<Complex> ROfFxAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> fxs, IEnumerable<double> fts);
 
         /// <summary>
-        /// Overload of scalar ROfFxAndFt function. Determines reflectance given tissue regions, spatial 
-        /// frequencies 'fxs', and temporal frequencies fts
+        /// Determines reflectance at given tissue regions 'regions',
+        /// spatial frequencies 'fxs', and temporal frequencies 'fts'
         /// </summary>
         /// <param name="regions">sets of medium optical and geometrical properties for each sub-region</param>
         /// <param name="fxs">spatial frequencies</param>
@@ -788,8 +794,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
 
         #region FluenceOfRhoAndZ
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence at optical properties 'ops' and
-        /// source-detector separations 'rhos' and 'zs'
+        /// Determines fluence at optical properties 'ops', source-detector separations 'rhos' and z-values 'zs'
         /// </summary>
         /// <param name="ops">sets of medium optical properties </param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -798,8 +803,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] FluenceOfRhoAndZ(OpticalProperties[] ops, double[] rhos, double[] zs);
 
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence at optical properties 'ops' and
-        /// source-detector separations 'rhos' and 'zs'
+        /// Determines fluence at optical properties 'ops', source-detector separations 'rhos' and z-values 'zs'
         /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
         /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>
@@ -810,8 +814,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs);
 
         /// <summary>
-        ///  Overload of scalar FluenceOfRhoAndZ function. Determines fluence of tissue 'regions' and
-        /// source-detector separations 'rhos' and 'zs'
+        /// Determines fluence of tissue regions 'regions', source-detector separations 'rhos' and depth bins 'zs'
         /// </summary>
         /// <param name="regions">tissue regions</param>
         /// <param name="rhos">source-detector separations</param>
@@ -820,8 +823,7 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<double> FluenceOfRhoAndZ(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs);
 
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZ function. Determines fluence of tissue 'regions' and
-        /// source-detector separations 'rhos' and 'zs'
+        /// Determines fluence of tissue regions 'regions', source-detector separations 'rhos' and depth bins 'zs'
         /// </summary>
         /// <param name="regions">tissue regions</param>
         /// <param name="rhos">source-detector separations</param>
@@ -832,8 +834,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
 
         #region FluenceOfRhoAndZAndTime
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops',
-        /// source-detector separations 'rhos', z values 'zs' and times 
+        /// Determines fluence at optical properties 'ops',
+        /// source-detector separations 'rhos', z-values 'zs' and times 'times'
         /// </summary>
         /// <param name="ops">sets of medium optical properties </param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -843,8 +845,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] FluenceOfRhoAndZAndTime(OpticalProperties[] ops, double[] rhos, double[] zs, double[] times);
 
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndTime function. Determines reflectance at optical properties 'ops',
-        /// source-detector separations 'rhos' and times 
+        /// Determines fluence at optical properties 'ops',
+        /// source-detector separations 'rhos', z-values 'zs' and times 'times'
         /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
         /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>
@@ -860,8 +862,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
 
         #region FluenceOfRhoAndZAndFt
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndFt function. Determines reflectance at optical properties 'ops',
-        /// source-detector separations 'rhos', z values 'zs' and modulation frequencies 'fts'
+        /// Determines fluence at optical properties 'ops',
+        /// source-detector separations 'rhos', z-values 'zs' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties </param>
         /// <param name="rhos">source-detector separations (mm)</param>
@@ -871,8 +873,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] FluenceOfRhoAndZAndFt(OpticalProperties[] ops, double[] rhos, double[] zs, double[] fts);
 
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndFt function. Determines reflectance at optical properties 'ops',
-        /// source-detector separations 'rhos' and time frequencies 'fts'
+        /// Determines fluence at optical properties 'ops',
+        /// source-detector separations 'rhos', z-values 'zs' and time frequencies 'fts'
         /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
         /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>
@@ -886,8 +888,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<OpticalProperties> ops, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
 
         /// <summary>
-        ///  Overload of scalar FluenceOfRhoAndZAndFt function. Determines fluence of tissue 'regions' and
-        /// source-detector separations 'rhos' and 'zs' at temporal frequencies fts
+        ///  Determines fluence of tissue regions 'regions',
+        /// source-detector separations 'rhos', z-values 'zs' and temporal frequencies 'fts'
         /// </summary>
         /// <param name="regions">tissue regions</param>
         /// <param name="rhos">source-detector separations</param>
@@ -897,8 +899,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         IEnumerable<Complex> FluenceOfRhoAndZAndFt(IEnumerable<IOpticalPropertyRegion[]> regions, IEnumerable<double> rhos, IEnumerable<double> zs, IEnumerable<double> fts);
 
         /// <summary>
-        /// Overload of scalar FluenceOfRhoAndZAndFt function. Determines fluence of tissue 'regions' and
-        /// source-detector separations 'rhos' and 'zs' at temporal frequencies fts
+        /// Determines fluence of tissue regions 'regions',
+        /// source-detector separations 'rhos', z-values 'zs' and temporal frequencies 'fts'
         /// </summary>
         /// <param name="regions">tissue regions</param>
         /// <param name="rhos">source-detector separations</param>
@@ -910,8 +912,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
 
         #region FluenceOfFxAndZ
         /// <summary>
-        /// Overload of scalar FluenceOfFxAndZ function. Determines reflectance at optical properties 'ops',
-        /// spatial frequencies 'fxs' and z values 'zs'
+        /// Determines fluence at optical properties 'ops',
+        /// spatial frequencies 'fxs' and z-values 'zs'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -920,8 +922,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] FluenceOfFxAndZ(OpticalProperties[] ops, double[] fxs, double[] zs);
 
         /// <summary>
-        /// Overload of scalar FluenceOfFxAndZ function. Determines reflectance at optical properties 'ops'
-        /// and spatial frequencies 'fxs'
+        /// Determines fluence at optical properties 'ops',
+        /// spatial frequencies 'fxs' and z-values 'zs'
         /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
         /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>
@@ -934,8 +936,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
 
         #region FluenceOfFxAndZAndTime
         /// <summary>
-        /// Overload of scalar FluenceOfFxAndZAndTime function. Determines reflectance at optical properties 'ops',
-        /// spatial frequencies 'fxs', z values 'zs' and times 
+        /// Determines fluence at optical properties 'ops',
+        /// spatial frequencies 'fxs', z-values 'zs' and times 'times' 
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fxs">spatial frequencies (1/mm)</param>
@@ -945,8 +947,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         double[] FluenceOfFxAndZAndTime(OpticalProperties[] ops, double[] fxs, double[] zs, double[] times);
 
         /// <summary>
-        /// Overload of scalar FluenceOfFxAndZAndTime function. Determines reflectance at optical properties 'ops',
-        /// spatial frequencies 'fxs' and times 
+        /// Determines fluence at optical properties 'ops',
+        /// spatial frequencies 'fxs', z-values 'zs' and times 'times'
         /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
         /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>
@@ -960,8 +962,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
 
         #region FluenceOfFxAndZAndFt
         /// <summary>
-        /// Overload of scalar FluenceOfFxAndZAndFt function. Determines reflectance at optical properties 'ops',
-        /// spatial frequencies 'fxs', z values 'zs' and modulation frequencies 'fts'
+        /// Determines fluence at optical properties 'ops',
+        /// spatial frequencies 'fxs', z-values 'zs' and modulation frequencies 'fts'
         /// </summary>
         /// <param name="ops">sets of medium optical properties</param>
         /// <param name="fx">spatial frequencies (1/mm)</param>
@@ -971,8 +973,8 @@ IEnumerable<double> ROfFxAndTime(IEnumerable<IOpticalPropertyRegion[]> regions,
         Complex[] FluenceOfFxAndZAndFt(OpticalProperties[] ops, double[] fx, double[] zs, double[] fts);
 
         /// <summary>
-        /// Overload of scalar FluenceOfFxAndZAndFt function. Determines reflectance at optical properties 'ops',
-        /// spatial frequencies 'fxs' and time frequencies 'fts'
+        /// Determines fluence at optical properties 'ops',
+        /// spatial frequencies 'fxs', z-values 'zs' and time frequencies 'fts'
         /// This method is designed to return values based on iteration with the leftmost IEnumerable&lt;double&gt;
         /// input being the top-level, and so-on such that the right-most input is at the inner-most loop
         /// </summary>

From 764e619340d31d6354bb1ab40f8ad627b90c48f8 Mon Sep 17 00:00:00 2001
From: Lisa Malenfant <lisa.malenfant@uci.edu>
Date: Thu, 5 Oct 2023 15:29:05 -0700
Subject: [PATCH 9/9] Added an OnPropertyChanged method to remove the warning
 that the event PropertyChanged was not being used

---
 .../MonteCarlo/Demo07pMCInversion.cs          | 50 +++++++++++++++----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/Vts.Scripting/MonteCarlo/Demo07pMCInversion.cs b/src/Vts.Scripting/MonteCarlo/Demo07pMCInversion.cs
index d72d907a6..a7a437061 100644
--- a/src/Vts.Scripting/MonteCarlo/Demo07pMCInversion.cs
+++ b/src/Vts.Scripting/MonteCarlo/Demo07pMCInversion.cs
@@ -1,4 +1,6 @@
-namespace Vts.Scripting.MonteCarlo;
+using System.ComponentModel;
+
+namespace Vts.Scripting.MonteCarlo;
 
 /// <summary>
 /// Class using the Vts.dll library to demonstrate using the Perturbation Monte Carlo post-processor to calculate optical properties (i.e. "inversion")
@@ -28,21 +30,21 @@ public static void RunDemo(bool showPlots = true)
             Regions = new ITissueRegion[]
             {
                 new LayerTissueRegion(
-                    zRange: new(double.NegativeInfinity, 0),         // air "z" range
-                    op: new(mua: 0.0, musp: 1E-10, g: 1.0, n: 1.0)), // air optical properties
+                    zRange: new DoubleRange(double.NegativeInfinity, 0),         // air "z" range
+                    op: new OpticalProperties(mua: 0.0, musp: 1E-10, g: 1.0, n: 1.0)), // air optical properties
                 new LayerTissueRegion(
-                    zRange: new(0, 100),                             // tissue "z" range ("semi-infinite" slab, 100mm thick)
-                    op: new(mua: 0.01, musp: 1.0, g: 0.8, n: 1.4)),  // tissue optical properties
+                    zRange: new DoubleRange(0, 100),                             // tissue "z" range ("semi-infinite" slab, 100mm thick)
+                    op: new OpticalProperties(mua: 0.01, musp: 1.0, g: 0.8, n: 1.4)),  // tissue optical properties
                 new LayerTissueRegion(
-                    zRange: new(100, double.PositiveInfinity),       // air "z" range
-                    op: new(mua: 0.0, musp: 1E-10, g: 1.0, n: 1.0))  // air optical properties
+                    zRange: new DoubleRange(100, double.PositiveInfinity),       // air "z" range
+                    op: new OpticalProperties(mua: 0.0, musp: 1E-10, g: 1.0, n: 1.0))  // air optical properties
             }
         };
         var simulationInput = new SimulationInput
         {
             N = 1000,
             TissueInput = tissueInput,
-            DetectorInputs = new IDetectorInput[] { }, // leaving this empty - no on-the-fly detectors needed!
+            DetectorInputs = Array.Empty<IDetectorInput>(), // leaving this empty - no on-the-fly detectors needed!
             OutputName = "results",
             Options = new SimulationOptions
             {
@@ -118,6 +120,35 @@ private class PmcForwardSolver : IForwardSolver
         private readonly DoubleRange _detectorRange;
         private readonly SimulationInput _simulationInput;
         private readonly pMCDatabase _photonDatabase;
+        private double _beamDiameter;
+
+        /// <summary>
+        /// IForwardSolver implements INotifyPropertyChanged to notify if
+        /// a property changes 
+        /// </summary>
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        /// <summary>
+        ///  OnPropertyChanged method to raise the property changed event
+        /// </summary>
+        /// <param name="name">The property name</param>
+        private void OnPropertyChanged(string name)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+        }
+
+        /// <summary>
+        /// Beam Diameter
+        /// </summary>
+        public double BeamDiameter
+        {
+            get => _beamDiameter;
+            set
+            {
+                _beamDiameter = value;
+                OnPropertyChanged("BeamDiameter");
+            }
+        }
 
         /// <summary>
         /// Initializes a new instance of the PmcForwardSolver class using the specified detector range, simulation input, and photon database.
@@ -653,9 +684,6 @@ public IEnumerable<Complex> FluenceOfFxAndZAndFt(IEnumerable<OpticalProperties>
         {
             throw new NotImplementedException();
         }
-        public double BeamDiameter { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-
-        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
         #endregion
     }
 }
\ No newline at end of file