Skip to content

Commit

Permalink
JNB: Choose colours modulo cmap.N in case more ROIs than colours
Browse files Browse the repository at this point in the history
  • Loading branch information
@scottclowe
scottclowe committed Jul 9, 2021
1 parent 4edfd05 commit c911477
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
10 changes: 6 additions & 4 deletions examples/Basic usage.ipynb
View file
Expand Up @@ -375,12 +375,14 @@
" plt.subplot(n_trial, n_roi, i_subplot)\n",
" # Plot the data\n",
" plt.plot(\n",
" experiment.raw[i_roi][i_trial][0, :], label=\"Raw\", color=cmap(i_roi * 2)\n",
" experiment.raw[i_roi][i_trial][0, :],\n",
" label=\"Raw\",\n",
" color=cmap((i_roi * 2) % cmap.N),\n",
" )\n",
" plt.plot(\n",
" experiment.result[i_roi][i_trial][0, :],\n",
" label=\"Decontaminated\",\n",
" color=cmap(i_roi * 2 + 1),\n",
" color=cmap((i_roi * 2 + 1) % cmap.N),\n",
" )\n",
" # Labels and boiler plate\n",
" plt.ylim([-0.05 * roi_max[i_roi], roi_max[i_roi] * 1.05])\n",
Expand Down Expand Up @@ -489,13 +491,13 @@
" tt,\n",
" experiment.deltaf_raw[i_roi][i_trial][0, :],\n",
" label=\"Raw\",\n",
" color=cmap(i_roi * 2),\n",
" color=cmap((i_roi * 2) % cmap.N),\n",
" )\n",
" plt.plot(\n",
" tt,\n",
" experiment.deltaf_result[i_roi][i_trial][0, :],\n",
" label=\"Decontaminated\",\n",
" color=cmap(i_roi * 2 + 1),\n",
" color=cmap((i_roi * 2 + 1) % cmap.N),\n",
" )\n",
" # Labels and boiler plate\n",
" plt.ylim([-0.05 * roi_max[i_roi], roi_max[i_roi] * 1.05])\n",
Expand Down
6 changes: 3 additions & 3 deletions examples/SIMA example.ipynb
View file
Expand Up @@ -217,7 +217,7 @@
" plt.plot(\n",
" roi_poly[trial][0][0][:, 1],\n",
" roi_poly[trial][0][0][:, 0],\n",
" color=cmap(i_roi * 2 + 1),\n",
" color=cmap((i_roi * 2 + 1) % cmap.N),\n",
" )\n",
"\n",
"plt.show()"
Expand Down Expand Up @@ -257,12 +257,12 @@
" plt.plot(\n",
" experiment.raw[i_roi][i_trial][0, :],\n",
" label=\"Raw (SIMA)\",\n",
" color=cmap(i_roi * 2),\n",
" color=cmap((i_roi * 2) % cmap.N),\n",
" )\n",
" plt.plot(\n",
" experiment.result[i_roi][i_trial][0, :],\n",
" label=\"FISSA\",\n",
" color=cmap(i_roi * 2 + 1),\n",
" color=cmap((i_roi * 2 + 1) % cmap.N),\n",
" )\n",
" # Labels and boiler plate\n",
" plt.ylim([-0.05 * roi_max[i_roi], roi_max[i_roi] * 1.05])\n",
Expand Down
6 changes: 3 additions & 3 deletions examples/Suite2p example.ipynb
View file
Expand Up @@ -176,7 +176,7 @@
" plt.plot(\n",
" roi_poly[trial][0][0][:, 1],\n",
" roi_poly[trial][0][0][:, 0],\n",
" color=cmap(i_roi * 2 + 1),\n",
" color=cmap((i_roi * 2 + 1) % cmap.N),\n",
" )\n",
"\n",
"# ROI co-ordinates are half a pixel outside the image,\n",
Expand Down Expand Up @@ -220,12 +220,12 @@
" plt.plot(\n",
" experiment.raw[i_roi][i_trial][0, :],\n",
" label=\"Raw (suite2p)\",\n",
" color=cmap(i_roi * 2),\n",
" color=cmap(i_roi * 2 % cmap.N),\n",
" )\n",
" plt.plot(\n",
" experiment.result[i_roi][i_trial][0, :],\n",
" label=\"FISSA\",\n",
" color=cmap(i_roi * 2 + 1),\n",
" color=cmap((i_roi * 2 + 1) % cmap.N),\n",
" )\n",
" # Labels and boiler plate\n",
" plt.ylim([-0.05 * roi_max[i_roi], roi_max[i_roi] * 1.05])\n",
Expand Down
6 changes: 3 additions & 3 deletions examples/cNMF example.ipynb
View file
Expand Up @@ -196,7 +196,7 @@
" plt.plot(\n",
" roi_poly[trial][0][0][:, 1],\n",
" roi_poly[trial][0][0][:, 0],\n",
" color=cmap(i_roi * 2 + 1),\n",
" color=cmap((i_roi * 2 + 1) % cmap.N),\n",
" )\n",
"\n",
"# ROI co-ordinates are half a pixel outside the image,\n",
Expand Down Expand Up @@ -240,12 +240,12 @@
" plt.plot(\n",
" experiment.raw[i_roi][i_trial][0, :],\n",
" label=\"Raw (CNMF)\",\n",
" color=cmap(i_roi * 2),\n",
" color=cmap((i_roi * 2) % cmap.N),\n",
" )\n",
" plt.plot(\n",
" experiment.result[i_roi][i_trial][0, :],\n",
" label=\"FISSA\",\n",
" color=cmap(i_roi * 2 + 1),\n",
" color=cmap((i_roi * 2 + 1) % cmap.N),\n",
" )\n",
" # Labels and boiler plate\n",
" plt.ylim([-0.05 * roi_max[i_roi], roi_max[i_roi] * 1.05])\n",
Expand Down

0 comments on commit c911477

Please sign in to comment.