Merge pull request #11 from VirtualPhotonics/hotfix/10-fix-the-asenumerable-issue-in-the-script-samples

hotfix-10-fix-the-asenumerable-issue-in-the-script-samples

Author: Lisa Glover

scripting/monte_carlo/demo_01_r_of_rho_simple.ipynb

@@ -25,7 +25,8 @@
     "#Import the Operating System so we can access the files for the VTS library\n",
     "import os\n",
     "current_directory = os.getcwd()\n",
-    "publish_local = current_directory.replace(\"monte_carlo\", \"libraries\\Vts.dll\")"
+    "library_directory = current_directory.replace(\"monte_carlo\", \"libraries\")\n",
+    "vts_path = os.path.join(library_directory, \"Vts.dll\")"
    ]
   },
   {
@@ -62,7 +63,7 @@
     "from pythonnet import set_runtime\n",
     "set_runtime(\"coreclr\")\n",
     "import clr\n",
-    "clr.AddReference(publish_local)\n",
+    "clr.AddReference(vts_path)\n",
     "import numpy as np\n",
     "import plotly.graph_objects as go\n",
     "import plotly.express as px\n",
@@ -120,7 +121,7 @@
     "detectorResults = Array.CreateInstance(ROfRhoDetector,1)\n",
     "detectorResults[0] = simulationOutput.ResultsDictionary[\"ROfRho\"]\n",
     "logReflectance = [r for r in detectorResults[0].Mean]\n",
-    "detectorMidpoints = [mp for mp in detectorRange.AsEnumerable()]\n",
+    "detectorMidpoints = [mp for mp in detectorRange]\n",
     "\n",
     "xLabel = \"ρ [mm]\"\n",
     "yLabel = \"log(R(ρ)) [mm-2]\"\n",

scripting/monte_carlo/demo_02_DAW_vs_CAW.ipynb

@@ -27,7 +27,8 @@
     "#Import the Operating System so we can access the files for the VTS library\n",
     "import os\n",
     "current_directory = os.getcwd()\n",
-    "publish_local = current_directory.replace(\"monte_carlo\", \"libraries\\Vts.dll\")"
+    "library_directory = current_directory.replace(\"monte_carlo\", \"libraries\")\n",
+    "vts_path = os.path.join(library_directory, \"Vts.dll\")"
    ]
   },
   {
@@ -68,7 +69,7 @@
     "from pythonnet import set_runtime\n",
     "set_runtime(\"coreclr\")\n",
     "import clr\n",
-    "clr.AddReference(publish_local)\n",
+    "clr.AddReference(vts_path)\n",
     "import numpy as np\n",
     "import plotly.graph_objects as go\n",
     "import plotly.express as px\n",
@@ -144,12 +145,12 @@
     "detectorResults1 = Array.CreateInstance(ROfRhoDetector,1)\n",
     "detectorResults1[0] = simulationOutput1.ResultsDictionary[\"ROfRho\"]\n",
     "logReflectance1 = [r for r in detectorResults1[0].Mean]\n",
-    "detectorMidpoints1 = [mp for mp in detectorRange.AsEnumerable()]\n",
+    "detectorMidpoints1 = [mp for mp in detectorRange]\n",
     "\n",
     "detectorResults2 = Array.CreateInstance(ROfRhoDetector,1)\n",
     "detectorResults2[0] = simulationOutput2.ResultsDictionary[\"ROfRho\"]\n",
     "logReflectance2 = [r for r in detectorResults2[0].Mean]\n",
-    "detectorMidpoints2 = [mp for mp in detectorRange.AsEnumerable()]\n",
+    "detectorMidpoints2 = [mp for mp in detectorRange]\n",
     "\n",
     "xLabel = \"ρ [mm]\"\n",
     "yLabel = \"log(R(ρ)) [mm-2]\"\n",

scripting/monte_carlo/vts-trial.ipynb

@@ -15,11 +15,9 @@
     "\n",
     "* [.NET 6](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) has been installed\n",
     "\n",
-    "* [VTS git repository](https://github.com/VirtualPhotonics/VTS) has been cloned\n",
-    "\n",
     "* [pythonnet](https://pypi.org/project/pythonnet) has been installed and configured\n",
     "\n",
-    "Replace `/path/to/vts` with the directory containing the git clone of `VTS`"
+    "* The latest [VTS libraries](https://github.com/VirtualPhotonics/Vts.Scripting.Python/releases) have been downloaded from the zip file in releases and extracted to the libraries folder"
    ]
   },
   {
@@ -36,7 +34,12 @@
     "import numpy as np\n",
     "import matplotlib.pyplot as plt\n",
     "\n",
-    "clr.AddReference(\"/path/to/vts/publish/local/Vts.dll\")"
+    "#Import the Operating System so we can get the file path for the Vts library\n",
+    "import os\n",
+    "current_directory = os.getcwd()\n",
+    "library_directory = current_directory.replace(\"monte_carlo\", \"libraries\")\n",
+    "vts_path = os.path.join(library_directory, \"Vts.dll\")\n",
+    "clr.AddReference(vts_path)"
    ]
   },
   {
@@ -277,7 +280,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.3"
+   "version": "3.11.5"
   }
  },
  "nbformat": 4,