diff --git a/docs/notebooks/apply_oe.ipynb b/docs/notebooks/apply_oe.ipynb index 97a3d0b..1b92228 100644 --- a/docs/notebooks/apply_oe.ipynb +++ b/docs/notebooks/apply_oe.ipynb @@ -51,11 +51,11 @@ "\n", "The script is run via the CLI. For example:\n", "\n", - "> `IC=$(isofit path imagecube)` sets the environment variable `IC` to the output of the command `isofit path imagecube`. This is just used to reuse the same output for multiple arguments.\n", + "> `IC=$(isofit path examples)/image_cube/small` sets the environment variable `IC` to the output of the command `isofit path examples/image_cube/small`. This is just used to reuse the same output for multiple arguments.\n", "> Depending on the user's isofit installation environment, this path may vary. This command ensures the correct path is retrieved\n", "\n", "```bash\n", - " IC=$(isofit path imagecube)/small EX=$(isofit path examples)/image_cube/small \\\n", + " IC=$(isofit path examples)/image_cube/small EX=$(isofit path examples)/image_cube/small \\\n", " isofit apply_oe \\\n", " $IC/ang20170323t202244_rdn_7000-7010 \\\n", " $IC/ang20170323t202244_loc_7000-7010 \\\n", @@ -114,9 +114,9 @@ " shutil.rmtree(o)\n", "\n", "apply_oe(\n", - " input_radiance = str(env.path(\"imagecube\", \"small\", \"ang20170323t202244_rdn_7000-7010\")),\n", - " input_loc = str(env.path(\"imagecube\", \"small\", \"ang20170323t202244_loc_7000-7010\")),\n", - " input_obs = str(env.path(\"imagecube\", \"small\", \"ang20170323t202244_obs_7000-7010\")),\n", + " input_radiance = str(env.path(\"examples\", \"image_cube\", \"small\", \"ang20170323t202244_rdn_7000-7010\")),\n", + " input_loc = str(env.path(\"examples\", \"image_cube\", \"small\", \"ang20170323t202244_loc_7000-7010\")),\n", + " input_obs = str(env.path(\"examples\", \"image_cube\", \"small\", \"ang20170323t202244_obs_7000-7010\")),\n", " working_directory = str(output),\n", " sensor = \"ang\",\n", " surface_path = str(env.path(\"examples\", \"image_cube\", \"small\", \"configs\", \"surface.json\")),\n", @@ -161,9 +161,9 @@ "outputs": [], "source": [ "# Load the input files\n", - "rdn_path = env.path(\"imagecube\", \"small\", \"ang20170323t202244_rdn_7000-7010\")\n", - "loc_path = env.path(\"imagecube\", \"small\", \"ang20170323t202244_loc_7000-7010\")\n", - "obs_path = env.path(\"imagecube\", \"small\", \"ang20170323t202244_obs_7000-7010\")\n", + "rdn_path = env.path(\"examples\", \"image_cube\", \"small\", \"ang20170323t202244_rdn_7000-7010\")\n", + "loc_path = env.path(\"examples\", \"image_cube\", \"small\", \"ang20170323t202244_loc_7000-7010\")\n", + "obs_path = env.path(\"examples\", \"image_cube\", \"small\", \"ang20170323t202244_obs_7000-7010\")\n", "\n", "rdn = envi.open(envi_header(str(rdn_path)))\n", "loc = envi.open(envi_header(str(loc_path)))\n", @@ -300,7 +300,7 @@ "See the following CLI call to run Apply OE with the analytical line algorithm:\n", "\n", "```bash\n", - " IC=$(isofit path imagecube)/medium EX=$(isofit path examples)/image_cube/medium \\\n", + " IC=$(isofit path examples)/image_cube/medium EX=$(isofit path examples)/image_cube/medium \\\n", " isofit apply_oe \\\n", " $IC/ang20170323t202244_rdn_7k-8k \\\n", " $IC/ang20170323t202244_loc_7k-8k \\\n", @@ -353,9 +353,9 @@ " shutil.rmtree(o)\n", "\n", "apply_oe(\n", - " input_radiance = str(env.path(\"imagecube\", \"medium\", \"ang20170323t202244_rdn_7k-8k\")),\n", - " input_loc = str(env.path(\"imagecube\", \"medium\", \"ang20170323t202244_loc_7k-8k\")),\n", - " input_obs = str(env.path(\"imagecube\", \"medium\", \"ang20170323t202244_obs_7k-8k\")),\n", + " input_radiance = str(env.path(\"examples\", \"image_cube\", \"medium\", \"ang20170323t202244_rdn_7000-7010\")),\n", + " input_loc = str(env.path(\"examples\", \"image_cube\", \"medium\", \"ang20170323t202244_loc_7000-7010\")),\n", + " input_obs = str(env.path(\"examples\", \"image_cube\", \"medium\", \"ang20170323t202244_obs_7000-7010\")),\n", " working_directory = str(output),\n", " sensor = \"ang\",\n", " surface_path = str(env.path(\"examples\", \"image_cube\", \"medium\", \"configs\", \"surface.json\")),\n", @@ -425,9 +425,9 @@ "outputs": [], "source": [ "# Plotting the input data\n", - "rdn_path = env.path(\"imagecube\", \"medium\", \"ang20170323t202244_rdn_7k-8k\")\n", - "loc_path = env.path(\"imagecube\", \"medium\", \"ang20170323t202244_loc_7k-8k\")\n", - "obs_path = env.path(\"imagecube\", \"medium\", \"ang20170323t202244_obs_7k-8k\")\n", + "rdn_path = env.path(\"examples\", \"image_cube\", \"medium\", \"ang20170323t202244_rdn_7000-7010\")\n", + "loc_path = env.path(\"examples\", \"image_cube\", \"medium\", \"ang20170323t202244_loc_7000-7010\")\n", + "obs_path = env.path(\"examples\", \"image_cube\", \"medium\", \"ang20170323t202244_obs_7000-7010\")\n", "\n", "subs_rdn_path = env.path(\"examples\", \"image_cube\", \"medium\", \"input\", \"ang20170323t202244_subs_recon_rdn\")\n", "subs_loc_path = env.path(\"examples\", \"image_cube\", \"medium\", \"input\", \"ang20170323t202244_subs_recon_loc\")\n", @@ -556,9 +556,9 @@ ], "metadata": { "kernelspec": { - "display_name": "isofit", + "display_name": "Python 3 (ipykernel)", "language": "python", - "name": "isofit" + "name": "python3" }, "language_info": { "codemirror_mode": { @@ -570,7 +570,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.8" + "version": "3.10.14" } }, "nbformat": 4, diff --git a/image_cube/medium/templates/analytical.args.json b/image_cube/medium/templates/analytical.args.json index 75be7cc..223e0fb 100644 --- a/image_cube/medium/templates/analytical.args.json +++ b/image_cube/medium/templates/analytical.args.json @@ -1,7 +1,7 @@ [ - "{imagecube}/medium/ang20170323t202244_rdn_7k-8k", - "{imagecube}/medium/ang20170323t202244_loc_7k-8k", - "{imagecube}/medium/ang20170323t202244_obs_7k-8k", + "{examples}/image_cube/medium/ang20170323t202244_rdn_7k-8k", + "{examples}/image_cube/medium/ang20170323t202244_loc_7k-8k", + "{examples}/image_cube/medium/ang20170323t202244_obs_7k-8k", "{examples}/image_cube/medium", "ang", "--surface_path {examples}/image_cube/medium/configs/surface.json", diff --git a/image_cube/medium/templates/default.args.json b/image_cube/medium/templates/default.args.json index 46964bb..3efff74 100644 --- a/image_cube/medium/templates/default.args.json +++ b/image_cube/medium/templates/default.args.json @@ -1,7 +1,7 @@ [ - "{imagecube}/medium/ang20170323t202244_rdn_7k-8k", - "{imagecube}/medium/ang20170323t202244_loc_7k-8k", - "{imagecube}/medium/ang20170323t202244_obs_7k-8k", + "{examples}/image_cube/medium/ang20170323t202244_rdn_7k-8k", + "{examples}/image_cube/medium/ang20170323t202244_loc_7k-8k", + "{examples}/image_cube/medium/ang20170323t202244_obs_7k-8k", "{examples}/image_cube/medium", "ang", "--surface_path {examples}/image_cube/medium/configs/surface.json", diff --git a/image_cube/medium/templates/empirical.args.json b/image_cube/medium/templates/empirical.args.json index 9be5f7a..e371980 100644 --- a/image_cube/medium/templates/empirical.args.json +++ b/image_cube/medium/templates/empirical.args.json @@ -1,7 +1,7 @@ [ - "{imagecube}/medium/ang20170323t202244_rdn_7k-8k", - "{imagecube}/medium/ang20170323t202244_loc_7k-8k", - "{imagecube}/medium/ang20170323t202244_obs_7k-8k", + "{examples}/image_cube/medium/ang20170323t202244_rdn_7k-8k", + "{examples}/image_cube/medium/ang20170323t202244_loc_7k-8k", + "{examples}/image_cube/medium/ang20170323t202244_obs_7k-8k", "{examples}/image_cube/medium", "ang", "--surface_path {examples}/image_cube/medium/configs/surface.json", diff --git a/image_cube/small/templates/analytical.args.json b/image_cube/small/templates/analytical.args.json index 5fa23ad..4427c54 100644 --- a/image_cube/small/templates/analytical.args.json +++ b/image_cube/small/templates/analytical.args.json @@ -1,7 +1,7 @@ [ - "{imagecube}/small/ang20170323t202244_rdn_7000-7010", - "{imagecube}/small/ang20170323t202244_loc_7000-7010", - "{imagecube}/small/ang20170323t202244_obs_7000-7010", + "{examples}/image_cube/small/ang20170323t202244_rdn_7000-7010", + "{examples}/image_cube/small/ang20170323t202244_loc_7000-7010", + "{examples}/image_cube/small/ang20170323t202244_obs_7000-7010", "{examples}/image_cube/small", "ang", "--surface_path {examples}/image_cube/small/configs/surface.json", diff --git a/image_cube/small/templates/default.args.json b/image_cube/small/templates/default.args.json index 85e2b45..9c3dfd9 100644 --- a/image_cube/small/templates/default.args.json +++ b/image_cube/small/templates/default.args.json @@ -1,7 +1,7 @@ [ - "{imagecube}/small/ang20170323t202244_rdn_7000-7010", - "{imagecube}/small/ang20170323t202244_loc_7000-7010", - "{imagecube}/small/ang20170323t202244_obs_7000-7010", + "{examples}/image_cube/small/ang20170323t202244_rdn_7000-7010", + "{examples}/image_cube/small/ang20170323t202244_loc_7000-7010", + "{examples}/image_cube/small/ang20170323t202244_obs_7000-7010", "{examples}/image_cube/small", "ang", "--surface_path {examples}/image_cube/small/configs/surface.json", diff --git a/image_cube/small/templates/empirical.args.json b/image_cube/small/templates/empirical.args.json index 8fe4984..40cbbd9 100644 --- a/image_cube/small/templates/empirical.args.json +++ b/image_cube/small/templates/empirical.args.json @@ -1,7 +1,7 @@ [ - "{imagecube}/small/ang20170323t202244_rdn_7000-7010", - "{imagecube}/small/ang20170323t202244_loc_7000-7010", - "{imagecube}/small/ang20170323t202244_obs_7000-7010", + "{examples}/image_cube/small/ang20170323t202244_rdn_7000-7010", + "{examples}/image_cube/small/ang20170323t202244_loc_7000-7010", + "{examples}/image_cube/small/ang20170323t202244_obs_7000-7010", "{examples}/image_cube/small", "ang", "--surface_path {examples}/image_cube/small/configs/surface.json",