little correction

Author: AntSimi

examples/10_tracking_diagnostics/pet_center_count.py

@@ -77,7 +77,7 @@
 mask = a.lifetime >= 60
 ax_long = fig.add_axes([0.03, 0.53, 0.90, 0.45])
 g_a = a.grid_count(bins, center=True, filter=mask)
-m = g_a.display(ax_long, **kwargs_pcolormesh)
+g_a.display(ax_long, **kwargs_pcolormesh)
 ax_long.set_title(f"Anticyclones with lifetime >= 60 days ({mask.sum()} Obs)")
 ax_short = fig.add_axes([0.03, 0.03, 0.90, 0.45])
 g_a = a.grid_count(bins, center=True, filter=~mask)

examples/10_tracking_diagnostics/pet_pixel_used.py

@@ -74,7 +74,7 @@
 mask = a.lifetime >= 60
 ax_long = fig.add_axes([0.03, 0.53, 0.90, 0.45])
 g_a = a.grid_count(bins, intern=True, filter=mask)
-m = g_a.display(ax_long, **kwargs_pcolormesh)
+g_a.display(ax_long, **kwargs_pcolormesh)
 ax_long.set_title(f"Anticyclones with lifetime >= 60 days ({mask.sum()} Obs)")
 ax_short = fig.add_axes([0.03, 0.03, 0.90, 0.45])
 g_a = a.grid_count(bins, intern=True, filter=~mask)

notebooks/python_module/10_tracking_diagnostics/pet_center_count.ipynb

@@ -44,7 +44,25 @@
       },
       "outputs": [],
       "source": [
-        "a = TrackEddiesObservations.load_file(\n    py_eddy_tracker_sample.get_path(\"eddies_med_adt_allsat_dt2018/Anticyclonic.zarr\")\n)\nc = TrackEddiesObservations.load_file(\n    py_eddy_tracker_sample.get_path(\"eddies_med_adt_allsat_dt2018/Cyclonic.zarr\")\n)\n\n# Parameters\nt0, t1 = a.period\nstep = 0.125\nbins = ((-10, 37, step), (30, 46, step))\nkwargs_pcolormesh = dict(\n    cmap=\"terrain_r\", vmin=0, vmax=2, factor=1 / (step ** 2 * (t1 - t0)), name=\"count\"\n)"
+        "a = TrackEddiesObservations.load_file(\n    py_eddy_tracker_sample.get_path(\"eddies_med_adt_allsat_dt2018/Anticyclonic.zarr\")\n)\nc = TrackEddiesObservations.load_file(\n    py_eddy_tracker_sample.get_path(\"eddies_med_adt_allsat_dt2018/Cyclonic.zarr\")\n)"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {},
+      "source": [
+        "Parameters\n\n"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "collapsed": false
+      },
+      "outputs": [],
+      "source": [
+        "step = 0.125\nbins = ((-10, 37, step), (30, 46, step))\nkwargs_pcolormesh = dict(\n    cmap=\"terrain_r\", vmin=0, vmax=2, factor=1 / (a.nb_days * step ** 2), name=\"count\"\n)"
       ]
     },
     {
@@ -80,7 +98,7 @@
       },
       "outputs": [],
       "source": [
-        "fig = plt.figure(figsize=(12, 10))\nax_long = fig.add_axes([0.03, 0.53, 0.90, 0.45])\ng_a = a.grid_count(bins, center=True, filter=a.lifetime >= 30)\nm = g_a.display(ax_long, **kwargs_pcolormesh)\nax_long.set_title(\"Anticyclones with lifetime >= 30 days\")\nax_short = fig.add_axes([0.03, 0.03, 0.90, 0.45])\ng_a = a.grid_count(bins, center=True, filter=a.lifetime < 30)\nm = g_a.display(ax_short, **kwargs_pcolormesh)\nax_short.set_title(\"Anticyclones with lifetime < 30 days\")\nfor ax in (ax_short, ax_long):\n    ax.set_aspect(\"equal\"), ax.grid()\n    ax.set_xlim(-6, 36.5), ax.set_ylim(30, 46)\ncb = plt.colorbar(m, cax=fig.add_axes([0.94, 0.05, 0.015, 0.9]))"
+        "fig = plt.figure(figsize=(12, 10))\nmask = a.lifetime >= 60\nax_long = fig.add_axes([0.03, 0.53, 0.90, 0.45])\ng_a = a.grid_count(bins, center=True, filter=mask)\ng_a.display(ax_long, **kwargs_pcolormesh)\nax_long.set_title(f\"Anticyclones with lifetime >= 60 days ({mask.sum()} Obs)\")\nax_short = fig.add_axes([0.03, 0.03, 0.90, 0.45])\ng_a = a.grid_count(bins, center=True, filter=~mask)\nm = g_a.display(ax_short, **kwargs_pcolormesh)\nax_short.set_title(f\"Anticyclones with lifetime < 60 days ({(~mask).sum()} Obs)\")\nfor ax in (ax_short, ax_long):\n    ax.set_aspect(\"equal\"), ax.grid()\n    ax.set_xlim(-6, 36.5), ax.set_ylim(30, 46)\ncb = plt.colorbar(m, cax=fig.add_axes([0.94, 0.05, 0.015, 0.9]))"
       ]
     }
   ],

notebooks/python_module/10_tracking_diagnostics/pet_pixel_used.ipynb

@@ -44,7 +44,25 @@
       },
       "outputs": [],
       "source": [
-        "a = TrackEddiesObservations.load_file(\n    py_eddy_tracker_sample.get_path(\"eddies_med_adt_allsat_dt2018/Anticyclonic.zarr\")\n)\nc = TrackEddiesObservations.load_file(\n    py_eddy_tracker_sample.get_path(\"eddies_med_adt_allsat_dt2018/Cyclonic.zarr\")\n)\nt0, t1 = a.period\nstep = 0.125\nbins = ((-10, 37, step), (30, 46, step))\nkwargs_pcolormesh = dict(\n    cmap=\"terrain_r\", vmin=0, vmax=0.75, factor=1 / (t1 - t0), name=\"count\"\n)"
+        "a = TrackEddiesObservations.load_file(\n    py_eddy_tracker_sample.get_path(\"eddies_med_adt_allsat_dt2018/Anticyclonic.zarr\")\n)\nc = TrackEddiesObservations.load_file(\n    py_eddy_tracker_sample.get_path(\"eddies_med_adt_allsat_dt2018/Cyclonic.zarr\")\n)"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {},
+      "source": [
+        "Parameters\n\n"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "collapsed": false
+      },
+      "outputs": [],
+      "source": [
+        "step = 0.125\nbins = ((-10, 37, step), (30, 46, step))\nkwargs_pcolormesh = dict(\n    cmap=\"terrain_r\", vmin=0, vmax=0.75, factor=1 / a.nb_days, name=\"count\"\n)"
       ]
     },
     {
@@ -80,7 +98,7 @@
       },
       "outputs": [],
       "source": [
-        "fig = plt.figure(figsize=(12, 10))\nax_long = fig.add_axes([0.03, 0.53, 0.90, 0.45])\ng_a = a.grid_count(bins, intern=True, filter=a.lifetime >= 30)\nm = g_a.display(ax_long, **kwargs_pcolormesh)\nax_long.set_title(\"Anticyclones with lifetime >= 30 days\")\nax_short = fig.add_axes([0.03, 0.03, 0.90, 0.45])\ng_a = a.grid_count(bins, intern=True, filter=a.lifetime < 30)\nm = g_a.display(ax_short, **kwargs_pcolormesh)\nax_short.set_title(\"Anticyclones with lifetime < 30 days\")\nfor ax in (ax_short, ax_long):\n    ax.set_aspect(\"equal\"), ax.grid()\n    ax.set_xlim(-6, 36.5), ax.set_ylim(30, 46)\ncb = plt.colorbar(m, cax=fig.add_axes([0.94, 0.05, 0.015, 0.9]))"
+        "fig = plt.figure(figsize=(12, 10))\nmask = a.lifetime >= 60\nax_long = fig.add_axes([0.03, 0.53, 0.90, 0.45])\ng_a = a.grid_count(bins, intern=True, filter=mask)\ng_a.display(ax_long, **kwargs_pcolormesh)\nax_long.set_title(f\"Anticyclones with lifetime >= 60 days ({mask.sum()} Obs)\")\nax_short = fig.add_axes([0.03, 0.03, 0.90, 0.45])\ng_a = a.grid_count(bins, intern=True, filter=~mask)\nm = g_a.display(ax_short, **kwargs_pcolormesh)\nax_short.set_title(f\"Anticyclones with lifetime < 60 days ({(~mask).sum()} Obs)\")\nfor ax in (ax_short, ax_long):\n    ax.set_aspect(\"equal\"), ax.grid()\n    ax.set_xlim(-6, 36.5), ax.set_ylim(30, 46)\ncb = plt.colorbar(m, cax=fig.add_axes([0.94, 0.05, 0.015, 0.9]))"
       ]
     }
   ],

src/py_eddy_tracker/observations/observation.py

@@ -11,7 +11,6 @@
 from matplotlib.cm import get_cmap
 from matplotlib.collections import PolyCollection
 from matplotlib.colors import Normalize
-from matplotlib.path import Path as BasePath
 from netCDF4 import Dataset
 from numba import njit
 from numba import types as numba_types