Update a few small things.

Update build on windows for VS2019
A few other small updates.

Author: wcjohns

CMakeLists.txt

@@ -2,7 +2,7 @@
 # excpet iOS, Android, and Electron, InterSpecExe
 
 cmake_policy(SET CMP0048 NEW)
-project(InterSpec VERSION 1.0.8)
+project(InterSpec VERSION 1.0.9)
 
 cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 set(CMAKE_COLOR_MAKEFILE ON CACHE BOOL "Color" FORCE)
@@ -16,9 +16,9 @@ if(WIN32)
     include(cmake/ConfigureMsvc.txt)
     configure_msvc_runtime()
 
-    set(BOOST_PREFIX "C:/install/msvc2017/x64/boost_1_65_1")
-    set(ZLIB_PREFIX "C:/install/msvc2017/x64/zlib")
-    list(APPEND PATH_SUFFIXES "C:/install/msvc2017/x64/wt-3.3.4")
+    set(BOOST_PREFIX "C:/install/msvc2019/x64/boost_1_65_1")
+    set(ZLIB_PREFIX "C:/install/msvc2019/x64/zlib")
+    list(APPEND PATH_SUFFIXES "C:/install/msvc2019/x64/wt-3.3.4")
 
     set(EXECUTABLE_OUTPUT_PATH . CACHE PATH "Path to executables" FORCE)
     set(CMAKE_CXX_FLAGS
@@ -1042,7 +1042,7 @@ elseif(BUILD_AS_OSX_APP)
 
     #set MACOS_BUNDLE_VERSION_NUMBER for Info.plist.template to populate cooresponding value in Xcode
     #math(EXPR MACOS_BUNDLE_VERSION_NUMBER "100*(${PROJECT_VERSION_MAJOR}-1) + 10*${PROJECT_VERSION_MINOR} + ${PROJECT_VERSION_PATCH}" )
-    set(MACOS_BUNDLE_VERSION_NUMBER 13)
+    set(MACOS_BUNDLE_VERSION_NUMBER 14)
 
     set_target_properties(
         InterSpecExe

InterSpec/GammaInteractionCalc.h

@@ -111,12 +111,13 @@ double mass_attenuation_coef( float atomic_number, float energy );
 double transmition_coefficient_generic( float atomic_number, float areal_density,
                                 float energy );
 
+
+void example_integration();
+
 // When debugging we will grab a static mutex so we dont get jumbled stdout
 #define DEBUG_RAYTRACE_CALCS 0
 
 
-void example_integration();
-  
 /** Runs some simple test cases for #cylinder_exit_position, and cause assert(0) on error. */
 void test_cylinder_exit_position();
 
@@ -144,6 +145,16 @@ double exit_point_of_sphere_z( const double source_point[3],
                                double observation_dist,
                                bool postiveSolution = true );
 
+/** An enum to to tell #cylinder_exit_position which exit point from sphere you want.
+ 
+ A better name would be CylinderIntersectionDirection, but thats too long.
+ */
+enum class CylExitDir
+{
+  TowardDetector,
+  AwayFromDetector
+};
+
 /** Starting from a 'source_point' within the volume of the cylinder, and heading towards the 'detector_point' (think center
  of the detector face), returns the total attenuation coefficient along the path, including recursing into any sub-tubes, as well as
  sets the point where the ray leaves the cylinder.
@@ -156,7 +167,9 @@ double exit_point_of_sphere_z( const double source_point[3],
  @param[in] detector The {x, y, z} point on the detector face we care about (so center of detector, unless you are integrating over
  the detector face), in the coordinate system where cylinder is centered at {0,0,0}.
  @param[out] exit_point The final exit point from the cylinder, where the path will no longer go through the volume.
- @returns the attenuation coefficient from the path through the cylinder and its sub-cylinders. E.g.,
+ @returns The distance from source location to exit point.  Returns 0.0 if line does not intersect cylinder.  Note that this is not the
+ distance in the cylinder, but the total distance from source to exit point, so if source is outside volume, may be larger than cylinder
+ dimensions.
  \code{.cpp}
  double exit_point[3];
  const double distance_in_m = cylinder_exit_position( 0.5*m, 100*cm, {0,0.1*m,20*cm}, {0,0,10*m}, exit_point );
@@ -166,6 +179,7 @@ double exit_point_of_sphere_z( const double source_point[3],
 double cylinder_exit_position( const double radius, const double half_length,
                               const double source[3],
                               const double detector[3],
+                              const CylExitDir direction,
                               double exit_point[3] );
 
 
@@ -199,7 +213,7 @@ struct DistributedSrcCalc
   void eval_spherical( const double xx[], const int *ndimptr,
                        double ff[], const int *ncompptr ) const;
 
-  void eval_cyl_end_on( const double xx[], const int *ndimptr,
+  void eval_single_cyl_end_on( const double xx[], const int *ndimptr,
                       double ff[], const int *ncompptr ) const;
 
   void eval_cylinder( const double xx[], const int *ndimptr,