From b8249763ebb3d1f628643c01285fe8ba4fd7bfa8 Mon Sep 17 00:00:00 2001 From: Philipp Schlegel Date: Sat, 20 Jul 2024 08:52:21 +0100 Subject: [PATCH] a few fixes for annotation search: - fix set_default_annotation_version - fix docstrings to correctly reflect which version is being used - make version selection more verbose - update the annotation notebook --- .../tutorials/flywire_annotations.ipynb | 672 ++++++++++-------- fafbseg/flywire/annotations.py | 76 +- 2 files changed, 409 insertions(+), 339 deletions(-) diff --git a/docs/source/tutorials/flywire_annotations.ipynb b/docs/source/tutorials/flywire_annotations.ipynb index 73accb3..e710534 100644 --- a/docs/source/tutorials/flywire_annotations.ipynb +++ b/docs/source/tutorials/flywire_annotations.ipynb @@ -2,7 +2,11 @@ "cells": [ { "cell_type": "raw", - "metadata": {}, + "metadata": { + "vscode": { + "languageId": "raw" + } + }, "source": [ ".. _flywire_annotations:\n", "\n", @@ -26,20 +30,19 @@ "the \"Community labels\" column while (2) and (3) are used to fill the \"Classification\"\n", "and \"Type\" columns.\n", "\n", - "Currently ``fafbseg`` allows you to query (1) and (2) programmatically.\n", - "(3) is not yet supported." + "Currently ``fafbseg`` allows you to query (1) and (2) programmatically. (3) is not yet supported." ] }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 2, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Default dataset set to \"public\"\n" + "Default dataset set to \"public\".\n" ] } ], @@ -59,15 +62,15 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 3, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Using materialization version 630\n", - "Caching community annotations for materialization version \"630\"... Done.\n" + "Using materialization version 783.\n", + "Caching community annotations for materialization version \"783\"... Done.\n" ] }, { @@ -92,75 +95,92 @@ " \n", " \n", " id\n", + " created\n", + " superceded_id\n", " pt_position_x\n", " pt_position_y\n", " pt_position_z\n", - " pt_supervoxel_id\n", - " pt_root_id\n", " tag\n", " user\n", " user_id\n", + " pt_supervoxel_id\n", + " pt_root_id\n", + " user_name\n", " \n", " \n", " \n", " \n", - " 21364\n", + " 0\n", " 22248\n", + " 2022-02-07 05:30:08.054976+00:00\n", + " NaN\n", " 485772\n", " 238836\n", " 49920\n", - " 78957304514692633\n", - " 720575940625431866\n", " ALad1; right; acetylcholine\n", " Alexander Bates\n", " 355\n", + " 78957304514692633\n", + " 720575940625431866\n", + " Alexander Bates\n", " \n", " \n", - " 21365\n", + " 1\n", " 22249\n", + " 2022-02-07 05:30:08.056123+00:00\n", + " NaN\n", " 485772\n", " 238836\n", " 49920\n", - " 78957304514692633\n", - " 720575940625431866\n", " ALad1; right; acetylcholine\n", " Lab Members\n", " 1063\n", + " 78957304514692633\n", + " 720575940625431866\n", + " Lab Members\n", " \n", " \n", - " 51385\n", + " 2\n", " 49507\n", + " 2022-04-27 14:36:19.985327+00:00\n", + " NaN\n", " 485776\n", " 238836\n", " 49920\n", - " 78957304514685298\n", - " 720575940625431866\n", " ALPN,VM5v_adPN\n", " Philipp Schlegel\n", " 62\n", + " 78957304514685298\n", + " 720575940625431866\n", + " Philipp Schlegel\n", " \n", " \n", "\n", "" ], "text/plain": [ - " id pt_position_x pt_position_y pt_position_z pt_supervoxel_id \\\n", - "21364 22248 485772 238836 49920 78957304514692633 \n", - "21365 22249 485772 238836 49920 78957304514692633 \n", - "51385 49507 485776 238836 49920 78957304514685298 \n", + " id created superceded_id pt_position_x \\\n", + "0 22248 2022-02-07 05:30:08.054976+00:00 NaN 485772 \n", + "1 22249 2022-02-07 05:30:08.056123+00:00 NaN 485772 \n", + "2 49507 2022-04-27 14:36:19.985327+00:00 NaN 485776 \n", "\n", - " pt_root_id tag user \\\n", - "21364 720575940625431866 ALad1; right; acetylcholine Alexander Bates \n", - "21365 720575940625431866 ALad1; right; acetylcholine Lab Members \n", - "51385 720575940625431866 ALPN,VM5v_adPN Philipp Schlegel \n", + " pt_position_y pt_position_z tag \\\n", + "0 238836 49920 ALad1; right; acetylcholine \n", + "1 238836 49920 ALad1; right; acetylcholine \n", + "2 238836 49920 ALPN,VM5v_adPN \n", "\n", - " user_id \n", - "21364 355 \n", - "21365 1063 \n", - "51385 62 " + " user user_id pt_supervoxel_id pt_root_id \\\n", + "0 Alexander Bates 355 78957304514692633 720575940625431866 \n", + "1 Lab Members 1063 78957304514692633 720575940625431866 \n", + "2 Philipp Schlegel 62 78957304514685298 720575940625431866 \n", + "\n", + " user_name \n", + "0 Alexander Bates \n", + "1 Lab Members \n", + "2 Philipp Schlegel " ] }, - "execution_count": 2, + "execution_count": 3, "metadata": {}, "output_type": "execute_result" } @@ -179,14 +199,15 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 4, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Using cached materialization version 630\n" + "Using annotation version \"latest commit\" (b2bceba) from https://github.com/flyconnectome/flywire_annotations.\n", + "Using materialization version 783.\n" ] }, { @@ -221,11 +242,11 @@ " nucleus_id\n", " flow\n", " ...\n", - " ito_lee_hemilineage\n", - " hartenstein_hemilineage\n", " morphology_group\n", " top_nt\n", " top_nt_conf\n", + " known_nt\n", + " known_nt_source\n", " side\n", " nerve\n", " vfb_id\n", @@ -247,11 +268,11 @@ " 4518783.0\n", " intrinsic\n", " ...\n", - " ALad1\n", - " BAmv3\n", " ALad1__1\n", " acetylcholine\n", " 0.957189\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", " fw036274\n", @@ -260,26 +281,26 @@ " \n", " \n", "\n", - "

1 rows × 25 columns

\n", + "

1 rows × 27 columns

\n", "" ], "text/plain": [ " supervoxel_id root_id pos_x pos_y pos_z soma_x \\\n", "0 78957304514685298 720575940625431866 121444 59709 1248 125088.0 \n", "\n", - " soma_y soma_z nucleus_id flow ... ito_lee_hemilineage \\\n", - "0 52048.0 782.0 4518783.0 intrinsic ... ALad1 \n", + " soma_y soma_z nucleus_id flow ... morphology_group \\\n", + "0 52048.0 782.0 4518783.0 intrinsic ... ALad1__1 \n", "\n", - " hartenstein_hemilineage morphology_group top_nt top_nt_conf side \\\n", - "0 BAmv3 ALad1__1 acetylcholine 0.957189 left \n", + " top_nt top_nt_conf known_nt known_nt_source side nerve \\\n", + "0 acetylcholine 0.957189 acetylcholine Tanaka et al., 2012 left NaN \n", "\n", - " nerve vfb_id fbbt_id status \n", - "0 NaN fw036274 FBbt_00100386 NaN \n", + " vfb_id fbbt_id status \n", + "0 fw036274 FBbt_00100386 NaN \n", "\n", - "[1 rows x 25 columns]" + "[1 rows x 27 columns]" ] }, - "execution_count": 3, + "execution_count": 4, "metadata": {}, "output_type": "execute_result" } @@ -299,41 +320,43 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 5, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "supervoxel_id 78957304514685298\n", - "root_id 720575940625431866\n", - "pos_x 121444\n", - "pos_y 59709\n", - "pos_z 1248\n", - "soma_x 125088.0\n", - "soma_y 52048.0\n", - "soma_z 782.0\n", - "nucleus_id 4518783.0\n", - "flow intrinsic\n", - "super_class central\n", - "cell_class ALPN\n", - "cell_sub_class uniglomerular\n", - "cell_type NaN\n", - "hemibrain_type VM5v_adPN\n", - "ito_lee_hemilineage ALad1\n", - "hartenstein_hemilineage BAmv3\n", - "morphology_group ALad1__1\n", - "top_nt acetylcholine\n", - "top_nt_conf 0.957189\n", - "side left\n", - "nerve NaN\n", - "vfb_id fw036274\n", - "fbbt_id FBbt_00100386\n", - "status NaN\n", + "supervoxel_id 78957304514685298\n", + "root_id 720575940625431866\n", + "pos_x 121444\n", + "pos_y 59709\n", + "pos_z 1248\n", + "soma_x 125088.0\n", + "soma_y 52048.0\n", + "soma_z 782.0\n", + "nucleus_id 4518783.0\n", + "flow intrinsic\n", + "super_class central\n", + "cell_class ALPN\n", + "cell_sub_class uniglomerular\n", + "cell_type NaN\n", + "hemibrain_type VM5v_adPN\n", + "ito_lee_hemilineage ALad1\n", + "hartenstein_hemilineage BAmv3\n", + "morphology_group ALad1__1\n", + "top_nt acetylcholine\n", + "top_nt_conf 0.957189\n", + "known_nt acetylcholine\n", + "known_nt_source Tanaka et al., 2012\n", + "side left\n", + "nerve NaN\n", + "vfb_id fw036274\n", + "fbbt_id FBbt_00100386\n", + "status NaN\n", "Name: 0, dtype: object" ] }, - "execution_count": 4, + "execution_count": 5, "metadata": {}, "output_type": "execute_result" } @@ -353,14 +376,14 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 6, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Caching community annotations for materialization version \"630\"... Done.\n" + "Caching community annotations for materialization version \"783\"... Done.\n" ] }, { @@ -385,98 +408,123 @@ " \n", " \n", " id\n", + " created\n", + " superceded_id\n", " pos_x\n", " pos_y\n", " pos_z\n", - " supervoxel_id\n", - " root_id\n", " tag\n", " user\n", " user_id\n", + " supervoxel_id\n", + " root_id\n", + " user_name\n", " \n", " \n", " \n", " \n", - " 51343\n", + " 0\n", " 48935\n", + " 2022-04-27 14:21:54.766389+00:00\n", + " NaN\n", " 142332\n", " 61350\n", " 928\n", - " 80435185514499960\n", - " 720575940622287142\n", " ALPN,VM5v_adPN\n", " Philipp Schlegel\n", " 62\n", - " \n", - " \n", - " 51385\n", - " 49507\n", - " 121444\n", - " 59709\n", - " 1248\n", - " 78957304514685298\n", - " 720575940625431866\n", - " ALPN,VM5v_adPN\n", - " Philipp Schlegel\n", - " 62\n", - " \n", - " \n", - " 51389\n", - " 49514\n", - " 142668\n", - " 61600\n", - " 891\n", - " 80435185514491668\n", - " 720575940624661552\n", - " ALPN,VM5v_adPN\n", + " 80435185514499960\n", + " 720575940622287142\n", " Philipp Schlegel\n", - " 62\n", " \n", " \n", - " 51620\n", + " 1\n", " 49092\n", + " 2022-04-27 14:26:00.639112+00:00\n", + " NaN\n", " 120504\n", " 60065\n", " 1194\n", - " 78887004489925320\n", - " 720575940620189790\n", " ALPN,VM5v_adPN\n", " Philipp Schlegel\n", " 62\n", + " 78887004489925320\n", + " 720575940620189790\n", + " Philipp Schlegel\n", " \n", " \n", - " 51998\n", + " 2\n", " 49429\n", + " 2022-04-27 14:34:21.735996+00:00\n", + " NaN\n", " 142744\n", " 62078\n", " 944\n", + " ALPN,VM5v_adPN\n", + " Philipp Schlegel\n", + " 62\n", " 80435185514524409\n", " 720575940619637780\n", + " Philipp Schlegel\n", + " \n", + " \n", + " 3\n", + " 49507\n", + " 2022-04-27 14:36:19.985327+00:00\n", + " NaN\n", + " 121444\n", + " 59709\n", + " 1248\n", " ALPN,VM5v_adPN\n", " Philipp Schlegel\n", " 62\n", + " 78957304514685298\n", + " 720575940625431866\n", + " Philipp Schlegel\n", + " \n", + " \n", + " 4\n", + " 49495\n", + " 2022-04-27 14:36:02.233129+00:00\n", + " NaN\n", + " 121284\n", + " 59660\n", + " 1036\n", + " ALPN,VM5v_adPN\n", + " Philipp Schlegel\n", + " 62\n", + " 78957304447921539\n", + " 720575940610505170\n", + " Philipp Schlegel\n", " \n", " \n", "\n", "" ], "text/plain": [ - " id pos_x pos_y pos_z supervoxel_id root_id \\\n", - "51343 48935 142332 61350 928 80435185514499960 720575940622287142 \n", - "51385 49507 121444 59709 1248 78957304514685298 720575940625431866 \n", - "51389 49514 142668 61600 891 80435185514491668 720575940624661552 \n", - "51620 49092 120504 60065 1194 78887004489925320 720575940620189790 \n", - "51998 49429 142744 62078 944 80435185514524409 720575940619637780 \n", + " id created superceded_id pos_x pos_y \\\n", + "0 48935 2022-04-27 14:21:54.766389+00:00 NaN 142332 61350 \n", + "1 49092 2022-04-27 14:26:00.639112+00:00 NaN 120504 60065 \n", + "2 49429 2022-04-27 14:34:21.735996+00:00 NaN 142744 62078 \n", + "3 49507 2022-04-27 14:36:19.985327+00:00 NaN 121444 59709 \n", + "4 49495 2022-04-27 14:36:02.233129+00:00 NaN 121284 59660 \n", "\n", - " tag user user_id \n", - "51343 ALPN,VM5v_adPN Philipp Schlegel 62 \n", - "51385 ALPN,VM5v_adPN Philipp Schlegel 62 \n", - "51389 ALPN,VM5v_adPN Philipp Schlegel 62 \n", - "51620 ALPN,VM5v_adPN Philipp Schlegel 62 \n", - "51998 ALPN,VM5v_adPN Philipp Schlegel 62 " + " pos_z tag user user_id supervoxel_id \\\n", + "0 928 ALPN,VM5v_adPN Philipp Schlegel 62 80435185514499960 \n", + "1 1194 ALPN,VM5v_adPN Philipp Schlegel 62 78887004489925320 \n", + "2 944 ALPN,VM5v_adPN Philipp Schlegel 62 80435185514524409 \n", + "3 1248 ALPN,VM5v_adPN Philipp Schlegel 62 78957304514685298 \n", + "4 1036 ALPN,VM5v_adPN Philipp Schlegel 62 78957304447921539 \n", + "\n", + " root_id user_name \n", + "0 720575940622287142 Philipp Schlegel \n", + "1 720575940620189790 Philipp Schlegel \n", + "2 720575940619637780 Philipp Schlegel \n", + "3 720575940625431866 Philipp Schlegel \n", + "4 720575940610505170 Philipp Schlegel " ] }, - "execution_count": 5, + "execution_count": 6, "metadata": {}, "output_type": "execute_result" } @@ -489,14 +537,14 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 7, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Using materialization version 630\n" + "Using materialization version 783.\n" ] }, { @@ -531,21 +579,21 @@ " nucleus_id\n", " flow\n", " ...\n", - " hemibrain_type\n", - " ito_lee_hemilineage\n", - " hartenstein_hemilineage\n", " morphology_group\n", " top_nt\n", " top_nt_conf\n", + " known_nt\n", + " known_nt_source\n", " side\n", " nerve\n", + " vfb_id\n", " fbbt_id\n", " status\n", " \n", " \n", " \n", " \n", - " 561\n", + " 0\n", " 80435185514499960\n", " 720575940622287142\n", " 142332\n", @@ -557,19 +605,19 @@ " 5057638.0\n", " intrinsic\n", " ...\n", - " VM5v_adPN\n", - " ALad1\n", - " BAmv3\n", - " ALad1_1\n", + " ALad1__1\n", " acetylcholine\n", - " 0.938421\n", + " 0.943605\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " right\n", " NaN\n", + " fw000568\n", " FBbt_00100386\n", " NaN\n", " \n", " \n", - " 11874\n", + " 1\n", " 78887004489925320\n", " 720575940620189790\n", " 120504\n", @@ -581,19 +629,19 @@ " 4518437.0\n", " intrinsic\n", " ...\n", - " VM5v_adPN\n", - " ALad1\n", - " BAmv3\n", - " ALad1_1\n", + " ALad1__1\n", " acetylcholine\n", - " 0.948491\n", + " 0.950719\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", + " fw012119\n", " FBbt_00100386\n", " NaN\n", " \n", " \n", - " 34685\n", + " 2\n", " 80435185514524409\n", " 720575940619637780\n", " 142744\n", @@ -605,19 +653,19 @@ " 5739285.0\n", " intrinsic\n", " ...\n", - " VM5v_adPN\n", - " ALad1\n", - " BAmv3\n", - " ALad1_1\n", + " ALad1__1\n", + " acetylcholine\n", + " 0.920976\n", " acetylcholine\n", - " 0.918128\n", + " Tanaka et al., 2012\n", " right\n", " NaN\n", + " fw034817\n", " FBbt_00100386\n", " NaN\n", " \n", " \n", - " 35972\n", + " 3\n", " 78957304447921539\n", " 720575940610505170\n", " 121284\n", @@ -629,19 +677,19 @@ " 4515954.0\n", " intrinsic\n", " ...\n", - " VM5v_adPN\n", - " ALad1\n", - " BAmv3\n", - " ALad1_1\n", + " ALad1__1\n", + " acetylcholine\n", + " 0.951816\n", " acetylcholine\n", - " 0.949083\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", + " fw036072\n", " FBbt_00100386\n", " NaN\n", " \n", " \n", - " 36182\n", + " 4\n", " 78957304514685298\n", " 720575940625431866\n", " 121444\n", @@ -653,55 +701,55 @@ " 4518783.0\n", " intrinsic\n", " ...\n", - " VM5v_adPN\n", - " ALad1\n", - " BAmv3\n", - " ALad1_1\n", + " ALad1__1\n", + " acetylcholine\n", + " 0.957189\n", " acetylcholine\n", - " 0.954871\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", + " fw036274\n", " FBbt_00100386\n", " NaN\n", " \n", " \n", "\n", - "

5 rows × 24 columns

\n", + "

5 rows × 27 columns

\n", "" ], "text/plain": [ - " supervoxel_id root_id pos_x pos_y pos_z soma_x \\\n", - "561 80435185514499960 720575940622287142 142332 61350 928 139912.0 \n", - "11874 78887004489925320 720575940620189790 120504 60065 1194 124824.0 \n", - "34685 80435185514524409 720575940619637780 142744 62078 944 140752.0 \n", - "35972 78957304447921539 720575940610505170 121284 59660 1036 124040.0 \n", - "36182 78957304514685298 720575940625431866 121444 59709 1248 125088.0 \n", + " supervoxel_id root_id pos_x pos_y pos_z soma_x \\\n", + "0 80435185514499960 720575940622287142 142332 61350 928 139912.0 \n", + "1 78887004489925320 720575940620189790 120504 60065 1194 124824.0 \n", + "2 80435185514524409 720575940619637780 142744 62078 944 140752.0 \n", + "3 78957304447921539 720575940610505170 121284 59660 1036 124040.0 \n", + "4 78957304514685298 720575940625431866 121444 59709 1248 125088.0 \n", "\n", - " soma_y soma_z nucleus_id flow ... hemibrain_type \\\n", - "561 51768.0 698.0 5057638.0 intrinsic ... VM5v_adPN \n", - "11874 49920.0 998.0 4518437.0 intrinsic ... VM5v_adPN \n", - "34685 52368.0 374.0 5739285.0 intrinsic ... VM5v_adPN \n", - "35972 49616.0 906.0 4515954.0 intrinsic ... VM5v_adPN \n", - "36182 52048.0 782.0 4518783.0 intrinsic ... VM5v_adPN \n", + " soma_y soma_z nucleus_id flow ... morphology_group \\\n", + "0 51768.0 698.0 5057638.0 intrinsic ... ALad1__1 \n", + "1 49920.0 998.0 4518437.0 intrinsic ... ALad1__1 \n", + "2 52368.0 374.0 5739285.0 intrinsic ... ALad1__1 \n", + "3 49616.0 906.0 4515954.0 intrinsic ... ALad1__1 \n", + "4 52048.0 782.0 4518783.0 intrinsic ... ALad1__1 \n", "\n", - " ito_lee_hemilineage hartenstein_hemilineage morphology_group \\\n", - "561 ALad1 BAmv3 ALad1_1 \n", - "11874 ALad1 BAmv3 ALad1_1 \n", - "34685 ALad1 BAmv3 ALad1_1 \n", - "35972 ALad1 BAmv3 ALad1_1 \n", - "36182 ALad1 BAmv3 ALad1_1 \n", + " top_nt top_nt_conf known_nt known_nt_source side nerve \\\n", + "0 acetylcholine 0.943605 acetylcholine Tanaka et al., 2012 right NaN \n", + "1 acetylcholine 0.950719 acetylcholine Tanaka et al., 2012 left NaN \n", + "2 acetylcholine 0.920976 acetylcholine Tanaka et al., 2012 right NaN \n", + "3 acetylcholine 0.951816 acetylcholine Tanaka et al., 2012 left NaN \n", + "4 acetylcholine 0.957189 acetylcholine Tanaka et al., 2012 left NaN \n", "\n", - " top_nt top_nt_conf side nerve fbbt_id status \n", - "561 acetylcholine 0.938421 right NaN FBbt_00100386 NaN \n", - "11874 acetylcholine 0.948491 left NaN FBbt_00100386 NaN \n", - "34685 acetylcholine 0.918128 right NaN FBbt_00100386 NaN \n", - "35972 acetylcholine 0.949083 left NaN FBbt_00100386 NaN \n", - "36182 acetylcholine 0.954871 left NaN FBbt_00100386 NaN \n", + " vfb_id fbbt_id status \n", + "0 fw000568 FBbt_00100386 NaN \n", + "1 fw012119 FBbt_00100386 NaN \n", + "2 fw034817 FBbt_00100386 NaN \n", + "3 fw036072 FBbt_00100386 NaN \n", + "4 fw036274 FBbt_00100386 NaN \n", "\n", - "[5 rows x 24 columns]" + "[5 rows x 27 columns]" ] }, - "execution_count": 6, + "execution_count": 7, "metadata": {}, "output_type": "execute_result" } @@ -721,14 +769,14 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 8, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Using materialization version 630\n" + "Using materialization version 783.\n" ] }, { @@ -763,11 +811,11 @@ " nucleus_id\n", " flow\n", " ...\n", - " ito_lee_hemilineage\n", - " hartenstein_hemilineage\n", " morphology_group\n", " top_nt\n", " top_nt_conf\n", + " known_nt\n", + " known_nt_source\n", " side\n", " nerve\n", " vfb_id\n", @@ -790,10 +838,10 @@ " afferent\n", " ...\n", " NaN\n", - " NaN\n", - " NaN\n", " acetylcholine\n", " 0.701929\n", + " NaN\n", + " NaN\n", " left\n", " PhN\n", " fw039687\n", @@ -814,10 +862,10 @@ " afferent\n", " ...\n", " NaN\n", - " NaN\n", - " NaN\n", " acetylcholine\n", " 0.623311\n", + " NaN\n", + " NaN\n", " left\n", " MxLbN\n", " fw043484\n", @@ -838,10 +886,10 @@ " afferent\n", " ...\n", " NaN\n", - " NaN\n", - " NaN\n", " acetylcholine\n", " 0.716926\n", + " NaN\n", + " NaN\n", " left\n", " MxLbN\n", " fw043485\n", @@ -862,10 +910,10 @@ " afferent\n", " ...\n", " NaN\n", - " NaN\n", - " NaN\n", " acetylcholine\n", " 0.747361\n", + " NaN\n", + " NaN\n", " left\n", " MxLbN\n", " fw043486\n", @@ -886,10 +934,10 @@ " afferent\n", " ...\n", " NaN\n", - " NaN\n", - " NaN\n", " acetylcholine\n", " 0.727190\n", + " NaN\n", + " NaN\n", " left\n", " MxLbN\n", " fw043487\n", @@ -898,7 +946,7 @@ " \n", " \n", "\n", - "

5 rows × 25 columns

\n", + "

5 rows × 27 columns

\n", "" ], "text/plain": [ @@ -909,31 +957,24 @@ "3 78888516385974174 720575940635791167 120512 82676 2063 NaN \n", "4 78747710244640262 720575940629270339 118458 82316 2109 NaN \n", "\n", - " soma_y soma_z nucleus_id flow ... ito_lee_hemilineage \\\n", - "0 NaN NaN NaN afferent ... NaN \n", - "1 NaN NaN NaN afferent ... NaN \n", - "2 NaN NaN NaN afferent ... NaN \n", - "3 NaN NaN NaN afferent ... NaN \n", - "4 NaN NaN NaN afferent ... NaN \n", - "\n", - " hartenstein_hemilineage morphology_group top_nt top_nt_conf side \\\n", - "0 NaN NaN acetylcholine 0.701929 left \n", - "1 NaN NaN acetylcholine 0.623311 left \n", - "2 NaN NaN acetylcholine 0.716926 left \n", - "3 NaN NaN acetylcholine 0.747361 left \n", - "4 NaN NaN acetylcholine 0.727190 left \n", + " soma_y soma_z nucleus_id flow ... morphology_group top_nt \\\n", + "0 NaN NaN NaN afferent ... NaN acetylcholine \n", + "1 NaN NaN NaN afferent ... NaN acetylcholine \n", + "2 NaN NaN NaN afferent ... NaN acetylcholine \n", + "3 NaN NaN NaN afferent ... NaN acetylcholine \n", + "4 NaN NaN NaN afferent ... NaN acetylcholine \n", "\n", - " nerve vfb_id fbbt_id status \n", - "0 PhN fw039687 NaN NaN \n", - "1 MxLbN fw043484 NaN NaN \n", - "2 MxLbN fw043485 NaN NaN \n", - "3 MxLbN fw043486 NaN NaN \n", - "4 MxLbN fw043487 NaN NaN \n", + " top_nt_conf known_nt known_nt_source side nerve vfb_id fbbt_id status \n", + "0 0.701929 NaN NaN left PhN fw039687 NaN NaN \n", + "1 0.623311 NaN NaN left MxLbN fw043484 NaN NaN \n", + "2 0.716926 NaN NaN left MxLbN fw043485 NaN NaN \n", + "3 0.747361 NaN NaN left MxLbN fw043486 NaN NaN \n", + "4 0.727190 NaN NaN left MxLbN fw043487 NaN NaN \n", "\n", - "[5 rows x 25 columns]" + "[5 rows x 27 columns]" ] }, - "execution_count": 6, + "execution_count": 8, "metadata": {}, "output_type": "execute_result" } @@ -962,7 +1003,7 @@ "output_type": "stream", "text": [ "Found 8 neurons matching the given criteria.\n", - "Using cached materialization version 630\n" + "Using materialization version 783.\n" ] }, { @@ -997,11 +1038,11 @@ " nucleus_id\n", " flow\n", " ...\n", - " ito_lee_hemilineage\n", - " hartenstein_hemilineage\n", " morphology_group\n", " top_nt\n", " top_nt_conf\n", + " known_nt\n", + " known_nt_source\n", " side\n", " nerve\n", " vfb_id\n", @@ -1023,11 +1064,11 @@ " 2469243.0\n", " intrinsic\n", " ...\n", - " ALl1_ventral\n", - " BAlc_ventral\n", " ALl1_ventral__7\n", " acetylcholine\n", " 0.929829\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", " fw012440\n", @@ -1047,11 +1088,11 @@ " 2469812.0\n", " intrinsic\n", " ...\n", - " ALl1_ventral\n", - " BAlc_ventral\n", " ALl1_ventral__7\n", " acetylcholine\n", " 0.909374\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", " fw032945\n", @@ -1071,11 +1112,11 @@ " 2468760.0\n", " intrinsic\n", " ...\n", - " ALl1_ventral\n", - " BAlc_ventral\n", " ALl1_ventral__7\n", " acetylcholine\n", " 0.894545\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", " fw033427\n", @@ -1095,11 +1136,11 @@ " 2471407.0\n", " intrinsic\n", " ...\n", - " ALl1_ventral\n", - " BAlc_ventral\n", " ALl1_ventral__7\n", " acetylcholine\n", " 0.930650\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", " fw033526\n", @@ -1119,11 +1160,11 @@ " 2468972.0\n", " intrinsic\n", " ...\n", - " ALl1_ventral\n", - " BAlc_ventral\n", " ALl1_ventral__7\n", " acetylcholine\n", " 0.916676\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", " fw034548\n", @@ -1143,11 +1184,11 @@ " 2476421.0\n", " intrinsic\n", " ...\n", - " ALl1_ventral\n", - " BAlc_ventral\n", " ALl1_ventral__7\n", " acetylcholine\n", " 0.928285\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", " fw035057\n", @@ -1167,11 +1208,11 @@ " 2468593.0\n", " intrinsic\n", " ...\n", - " ALl1_ventral\n", - " BAlc_ventral\n", " ALl1_ventral__7\n", " acetylcholine\n", " 0.938961\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", " fw035224\n", @@ -1191,11 +1232,11 @@ " 2532594.0\n", " intrinsic\n", " ...\n", - " ALl1_ventral\n", - " BAlc_ventral\n", " ALl1_ventral__7\n", " acetylcholine\n", " 0.899551\n", + " acetylcholine\n", + " Tanaka et al., 2012\n", " left\n", " NaN\n", " fw036329\n", @@ -1204,7 +1245,7 @@ " \n", " \n", "\n", - "

8 rows × 25 columns

\n", + "

8 rows × 27 columns

\n", "" ], "text/plain": [ @@ -1218,37 +1259,37 @@ "6 78323779658618911 720575940603231916 112038 56471 1216 100672.0 \n", "7 78464654585926444 720575940605102694 113795 58276 1223 103744.0 \n", "\n", - " soma_y soma_z nucleus_id flow ... ito_lee_hemilineage \\\n", - "0 57432.0 1311.0 2469243.0 intrinsic ... ALl1_ventral \n", - "1 55568.0 1655.0 2469812.0 intrinsic ... ALl1_ventral \n", - "2 56608.0 1386.0 2468760.0 intrinsic ... ALl1_ventral \n", - "3 55800.0 1508.0 2471407.0 intrinsic ... ALl1_ventral \n", - "4 54536.0 1584.0 2468972.0 intrinsic ... ALl1_ventral \n", - "5 55088.0 1687.0 2476421.0 intrinsic ... ALl1_ventral \n", - "6 54976.0 1388.0 2468593.0 intrinsic ... ALl1_ventral \n", - "7 60904.0 1295.0 2532594.0 intrinsic ... ALl1_ventral \n", + " soma_y soma_z nucleus_id flow ... morphology_group \\\n", + "0 57432.0 1311.0 2469243.0 intrinsic ... ALl1_ventral__7 \n", + "1 55568.0 1655.0 2469812.0 intrinsic ... ALl1_ventral__7 \n", + "2 56608.0 1386.0 2468760.0 intrinsic ... ALl1_ventral__7 \n", + "3 55800.0 1508.0 2471407.0 intrinsic ... ALl1_ventral__7 \n", + "4 54536.0 1584.0 2468972.0 intrinsic ... ALl1_ventral__7 \n", + "5 55088.0 1687.0 2476421.0 intrinsic ... ALl1_ventral__7 \n", + "6 54976.0 1388.0 2468593.0 intrinsic ... ALl1_ventral__7 \n", + "7 60904.0 1295.0 2532594.0 intrinsic ... ALl1_ventral__7 \n", "\n", - " hartenstein_hemilineage morphology_group top_nt top_nt_conf side \\\n", - "0 BAlc_ventral ALl1_ventral__7 acetylcholine 0.929829 left \n", - "1 BAlc_ventral ALl1_ventral__7 acetylcholine 0.909374 left \n", - "2 BAlc_ventral ALl1_ventral__7 acetylcholine 0.894545 left \n", - "3 BAlc_ventral ALl1_ventral__7 acetylcholine 0.930650 left \n", - "4 BAlc_ventral ALl1_ventral__7 acetylcholine 0.916676 left \n", - "5 BAlc_ventral ALl1_ventral__7 acetylcholine 0.928285 left \n", - "6 BAlc_ventral ALl1_ventral__7 acetylcholine 0.938961 left \n", - "7 BAlc_ventral ALl1_ventral__7 acetylcholine 0.899551 left \n", + " top_nt top_nt_conf known_nt known_nt_source side nerve \\\n", + "0 acetylcholine 0.929829 acetylcholine Tanaka et al., 2012 left NaN \n", + "1 acetylcholine 0.909374 acetylcholine Tanaka et al., 2012 left NaN \n", + "2 acetylcholine 0.894545 acetylcholine Tanaka et al., 2012 left NaN \n", + "3 acetylcholine 0.930650 acetylcholine Tanaka et al., 2012 left NaN \n", + "4 acetylcholine 0.916676 acetylcholine Tanaka et al., 2012 left NaN \n", + "5 acetylcholine 0.928285 acetylcholine Tanaka et al., 2012 left NaN \n", + "6 acetylcholine 0.938961 acetylcholine Tanaka et al., 2012 left NaN \n", + "7 acetylcholine 0.899551 acetylcholine Tanaka et al., 2012 left NaN \n", "\n", - " nerve vfb_id fbbt_id status \n", - "0 NaN fw012440 FBbt_00067363 NaN \n", - "1 NaN fw032945 FBbt_00067363 NaN \n", - "2 NaN fw033427 FBbt_00067363 NaN \n", - "3 NaN fw033526 FBbt_00067363 NaN \n", - "4 NaN fw034548 FBbt_00067363 NaN \n", - "5 NaN fw035057 FBbt_00067363 NaN \n", - "6 NaN fw035224 FBbt_00067363 NaN \n", - "7 NaN fw036329 FBbt_00067363 NaN \n", + " vfb_id fbbt_id status \n", + "0 fw012440 FBbt_00067363 NaN \n", + "1 fw032945 FBbt_00067363 NaN \n", + "2 fw033427 FBbt_00067363 NaN \n", + "3 fw033526 FBbt_00067363 NaN \n", + "4 fw034548 FBbt_00067363 NaN \n", + "5 fw035057 FBbt_00067363 NaN \n", + "6 fw035224 FBbt_00067363 NaN \n", + "7 fw036329 FBbt_00067363 NaN \n", "\n", - "[8 rows x 25 columns]" + "[8 rows x 27 columns]" ] }, "execution_count": 9, @@ -1288,7 +1329,7 @@ "output_type": "stream", "text": [ "Found 8 neurons matching the given criteria.\n", - "Using materialization version 630\n" + "Using materialization version 783.\n" ] }, { @@ -1333,7 +1374,7 @@ " \n", " 2\n", " 720575940603231916\n", - " 720575940630610425\n", + " 720575940635945919\n", " 46\n", " \n", " \n", @@ -1345,7 +1386,7 @@ " \n", " 4\n", " 720575940614309535\n", - " 720575940630610425\n", + " 720575940635945919\n", " 39\n", " \n", " \n", @@ -1356,9 +1397,9 @@ " pre post weight\n", "0 720575940605102694 720575940646122804 64\n", "1 720575940603231916 720575940629163931 50\n", - "2 720575940603231916 720575940630610425 46\n", + "2 720575940603231916 720575940635945919 46\n", "3 720575940603231916 720575940646122804 42\n", - "4 720575940614309535 720575940630610425 39" + "4 720575940614309535 720575940635945919 39" ] }, "execution_count": 10, @@ -1382,7 +1423,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 12, "metadata": {}, "outputs": [ { @@ -1395,7 +1436,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "94b6e7a5f99b4e82896b43df392d3caf", + "model_id": "b4e78c34b33946cfa3f8d6c10160248b", "version_major": 2, "version_minor": 0 }, @@ -1409,7 +1450,7 @@ { "data": { "text/html": [ - "<class 'navis.core.neuronlist.NeuronList'> containing 8 neurons (663.5KiB)
\n", + "<class 'navis.core.neuronlist.NeuronList'> containing 8 neurons (827.5KiB)
\n", "