Skip to content

Commit 902790e

Browse files
rcpeenercpeene
authored
Merge pull request #195 from AllenInstitute/dev
Reorganized toc and README
2 parents 753789b + 723332c commit 902790e

13 files changed

Lines changed: 937 additions & 906 deletions

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ jobs:
4040
filter: "*.ipynb"
4141

4242
- name: Testing notebooks
43-
if: ${{ steps.changed_files.outputs.added_modified }} != ""
43+
if: ${{ steps.changed_files.outputs.added_modified != '' }}
4444
run: pytest --nbmake --nbmake-timeout=5000 ${{ steps.changed_files.outputs.added_modified }}
4545

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ https://alleninstitute.github.io/openscope_databook
2727

2828
### Chapter 3: First-order analysis
2929
- [Neuropixel: Plotting receptive fields](https://github.com/AllenInstitute/openscope_databook/blob/main/docs/first-order/receptive_fields.ipynb)
30-
- [Neuropixel: Extracting Current Source Density plots](https://github.com/AllenInstitute/openscope_databook/blob/main/docs/first-order/current_source_density.ipynb)
3130
- [Neuropixel: Identifying opto-tagged cells](https://github.com/AllenInstitute/openscope_databook/blob/main/docs/first-order/optotagging.ipynb)
31+
- [Neuropixel: Extracting Current Source Density plots](https://github.com/AllenInstitute/openscope_databook/blob/main/docs/first-order/current_source_density.ipynb)
3232
- [2P: Cell matching across days](https://github.com/AllenInstitute/openscope_databook/blob/main/docs/first-order/cell_matching.ipynb)
3333
- 2P: How to align timestamps across modalities.
3434
- 2P: Stimuli averages with 2P data

‎docs/_toc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ parts:
2020
- caption: First-Order Analysis
2121
chapters:
2222
- file: first-order/receptive_fields.ipynb
23-
- file: first-order/current_source_density
2423
- file: first-order/optotagging.ipynb
24+
- file: first-order/current_source_density
2525
- file: first-order/cell_matching.ipynb

‎docs/basics/read_nwb.ipynb‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"outputs": [],
6363
"source": [
6464
"dandiset_id = \"000021\"\n",
65-
"dandi_filepath = \"sub-703279277/sub-703279277_ses-719161530.nwb\"\n",
65+
"dandi_filepath = \"sub-699733573/sub-699733573_ses-715093703.nwb\"\n",
6666
"download_loc = \".\""
6767
]
6868
},
@@ -83,11 +83,18 @@
8383
"id": "da61049a",
8484
"metadata": {},
8585
"outputs": [
86+
{
87+
"name": "stderr",
88+
"output_type": "stream",
89+
"text": [
90+
"A newer version (0.53.0) of dandi/dandi-cli is available. You are using 0.46.6\n"
91+
]
92+
},
8693
{
8794
"name": "stdout",
8895
"output_type": "stream",
8996
"text": [
90-
"Downloaded file to ./sub-703279277_ses-719161530.nwb\n"
97+
"Downloaded file to ./sub-699733573_ses-715093703.nwb\n"
9198
]
9299
}
93100
],
@@ -131,7 +138,7 @@
131138
"name": "stdout",
132139
"output_type": "stream",
133140
"text": [
134-
"root pynwb.file.NWBFile at 0x2455969512992\n",
141+
"root pynwb.file.NWBFile at 0x1716049481344\n",
135142
"Fields:\n",
136143
" acquisition: {\n",
137144
" raw_running_wheel_rotation <class 'pynwb.base.TimeSeries'>,\n",
@@ -155,8 +162,8 @@
155162
" probeF <class 'abc.EcephysElectrodeGroup'>\n",
156163
" }\n",
157164
" electrodes: electrodes <class 'hdmf.common.table.DynamicTable'>\n",
158-
" file_create_date: [datetime.datetime(2020, 5, 26, 0, 53, 26, 986517, tzinfo=tzoffset(None, -25200))]\n",
159-
" identifier: 719161530\n",
165+
" file_create_date: [datetime.datetime(2020, 5, 26, 0, 53, 26, 986608, tzinfo=tzoffset(None, -25200))]\n",
166+
" identifier: 715093703\n",
160167
" institution: Allen Institute for Brain Science\n",
161168
" intervals: {\n",
162169
" drifting_gratings_presentations <class 'pynwb.epoch.TimeIntervals'>,\n",
@@ -177,20 +184,20 @@
177184
" stimulus <class 'pynwb.base.ProcessingModule'>\n",
178185
" }\n",
179186
" session_description: Data and metadata for an Ecephys session\n",
180-
" session_id: 719161530\n",
181-
" session_start_time: 2019-01-08 16:25:16-08:00\n",
187+
" session_id: 715093703\n",
188+
" session_start_time: 2019-01-19 00:54:18-08:00\n",
182189
" stimulus_notes: brain_observatory_1.1\n",
183-
" subject: subject abc.EcephysSpecimen at 0x2455969512848\n",
190+
" subject: subject abc.EcephysSpecimen at 0x1716049229424\n",
184191
"Fields:\n",
185-
" age: P122D\n",
186-
" age_in_days: 122.0\n",
192+
" age: P118D\n",
193+
" age_in_days: 118.0\n",
187194
" genotype: Sst-IRES-Cre/wt;Ai32(RCL-ChR2(H134R)_EYFP)/wt\n",
188195
" sex: M\n",
189196
" species: Mus musculus\n",
190-
" specimen_name: Sst-IRES-Cre;Ai32-387858\n",
191-
" subject_id: 703279277\n",
197+
" specimen_name: Sst-IRES-Cre;Ai32-386129\n",
198+
" subject_id: 699733573\n",
192199
"\n",
193-
" timestamps_reference_time: 2019-01-08 16:25:16-08:00\n",
200+
" timestamps_reference_time: 2019-01-19 00:54:18-08:00\n",
194201
" units: units <class 'pynwb.misc.Units'>\n",
195202
"\n"
196203
]
@@ -240,7 +247,7 @@
240247
"name": "stderr",
241248
"output_type": "stream",
242249
"text": [
243-
"C:\\Users\\carter.peene\\AppData\\Local\\Temp\\ipykernel_1712\\3249629881.py:4: FutureWarning: Passing a negative integer is deprecated in version 1.0 and will not be supported in future version. Instead, use None to not limit the column width.\n",
250+
"C:\\Users\\carter.peene\\AppData\\Local\\Temp\\ipykernel_16628\\3249629881.py:4: FutureWarning: Passing a negative integer is deprecated in version 1.0 and will not be supported in future version. Instead, use None to not limit the column width.\n",
244251
" pd.set_option('display.max_colwidth', -1)\n"
245252
]
246253
}

‎docs/basics/stream_nwb.ipynb‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@
8080
"id": "a51caf90",
8181
"metadata": {},
8282
"outputs": [
83+
{
84+
"name": "stderr",
85+
"output_type": "stream",
86+
"text": [
87+
"A newer version (0.53.0) of dandi/dandi-cli is available. You are using 0.46.6\n"
88+
]
89+
},
8390
{
8491
"name": "stdout",
8592
"output_type": "stream",
@@ -108,7 +115,7 @@
108115
"name": "stdout",
109116
"output_type": "stream",
110117
"text": [
111-
"Retrieved file url https://dandiarchive.s3.amazonaws.com/blobs/f5f/175/f5f1752f-5227-47d5-8f75-cd71937878aa?response-content-disposition=attachment%3B%20filename%3D%22sub-699733573_ses-715093703.nwb%22&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAUBRWC5GAEKH3223E%2F20230419%2Fus-east-2%2Fs3%2Faws4_request&X-Amz-Date=20230419T212302Z&X-Amz-Expires=3600&X-Amz-SignedHeaders=host&X-Amz-Signature=8adf393c56367137b7a9b30b4dec0f51dc53bb1c644e0fc39e2bda5f8212772d\n"
118+
"Retrieved file url https://dandiarchive.s3.amazonaws.com/blobs/f5f/175/f5f1752f-5227-47d5-8f75-cd71937878aa?response-content-disposition=attachment%3B%20filename%3D%22sub-699733573_ses-715093703.nwb%22&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAUBRWC5GAEKH3223E%2F20230420%2Fus-east-2%2Fs3%2Faws4_request&X-Amz-Date=20230420T201648Z&X-Amz-Expires=3600&X-Amz-SignedHeaders=host&X-Amz-Signature=6088e2110f82ce358dec90e827468a37fd995c34e80089139ff1056659e1ccb8\n"
112119
]
113120
}
114121
],
@@ -194,7 +201,7 @@
194201
{
195202
"data": {
196203
"application/vnd.jupyter.widget-view+json": {
197-
"model_id": "68ddf60862604864ae406df6da33989b",
204+
"model_id": "770645b2edf24149ad7158e0ea7c3096",
198205
"version_major": 2,
199206
"version_minor": 0
200207
},

‎docs/basics/use_nwbwidgets.ipynb‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"outputs": [],
6262
"source": [
6363
"dandiset_id = \"000021\"\n",
64-
"dandi_filepath = \"sub-707296975/sub-707296975_ses-721123822.nwb\"\n",
64+
"dandi_filepath = \"sub-699733573/sub-699733573_ses-715093703.nwb\"\n",
6565
"download_loc = \".\""
6666
]
6767
},
@@ -82,11 +82,18 @@
8282
"id": "1c5db129",
8383
"metadata": {},
8484
"outputs": [
85+
{
86+
"name": "stderr",
87+
"output_type": "stream",
88+
"text": [
89+
"A newer version (0.53.0) of dandi/dandi-cli is available. You are using 0.46.6\n"
90+
]
91+
},
8592
{
8693
"name": "stdout",
8794
"output_type": "stream",
8895
"text": [
89-
"Downloaded file to ./sub-707296975_ses-721123822.nwb\n"
96+
"Downloaded file to ./sub-699733573_ses-715093703.nwb\n"
9097
]
9198
}
9299
],
@@ -132,7 +139,7 @@
132139
"name": "stdout",
133140
"output_type": "stream",
134141
"text": [
135-
"root pynwb.file.NWBFile at 0x2656323972736\n",
142+
"root pynwb.file.NWBFile at 0x2285253481232\n",
136143
"Fields:\n",
137144
" acquisition: {\n",
138145
" raw_running_wheel_rotation <class 'pynwb.base.TimeSeries'>,\n",
@@ -156,8 +163,8 @@
156163
" probeF <class 'abc.EcephysElectrodeGroup'>\n",
157164
" }\n",
158165
" electrodes: electrodes <class 'hdmf.common.table.DynamicTable'>\n",
159-
" file_create_date: [datetime.datetime(2020, 5, 26, 0, 53, 26, 832332, tzinfo=tzoffset(None, -25200))]\n",
160-
" identifier: 721123822\n",
166+
" file_create_date: [datetime.datetime(2020, 5, 26, 0, 53, 26, 986608, tzinfo=tzoffset(None, -25200))]\n",
167+
" identifier: 715093703\n",
161168
" institution: Allen Institute for Brain Science\n",
162169
" intervals: {\n",
163170
" drifting_gratings_presentations <class 'pynwb.epoch.TimeIntervals'>,\n",
@@ -178,20 +185,20 @@
178185
" stimulus <class 'pynwb.base.ProcessingModule'>\n",
179186
" }\n",
180187
" session_description: Data and metadata for an Ecephys session\n",
181-
" session_id: 721123822\n",
182-
" session_start_time: 2019-01-08 16:25:35-08:00\n",
188+
" session_id: 715093703\n",
189+
" session_start_time: 2019-01-19 00:54:18-08:00\n",
183190
" stimulus_notes: brain_observatory_1.1\n",
184-
" subject: subject abc.EcephysSpecimen at 0x2656348756528\n",
191+
" subject: subject abc.EcephysSpecimen at 0x2285271628048\n",
185192
"Fields:\n",
186-
" age: P125D\n",
187-
" age_in_days: 125.0\n",
188-
" genotype: Pvalb-IRES-Cre/wt;Ai32(RCL-ChR2(H134R)_EYFP)/wt\n",
193+
" age: P118D\n",
194+
" age_in_days: 118.0\n",
195+
" genotype: Sst-IRES-Cre/wt;Ai32(RCL-ChR2(H134R)_EYFP)/wt\n",
189196
" sex: M\n",
190197
" species: Mus musculus\n",
191-
" specimen_name: Pvalb-IRES-Cre;Ai32-388521\n",
192-
" subject_id: 707296975\n",
198+
" specimen_name: Sst-IRES-Cre;Ai32-386129\n",
199+
" subject_id: 699733573\n",
193200
"\n",
194-
" timestamps_reference_time: 2019-01-08 16:25:35-08:00\n",
201+
" timestamps_reference_time: 2019-01-19 00:54:18-08:00\n",
195202
" units: units <class 'pynwb.misc.Units'>\n",
196203
"\n"
197204
]
@@ -213,7 +220,7 @@
213220
{
214221
"data": {
215222
"application/vnd.jupyter.widget-view+json": {
216-
"model_id": "cb26375efbbc48298b11bee1a7af2fbb",
223+
"model_id": "ff394f60aa434277a364cc6bd96495c5",
217224
"version_major": 2,
218225
"version_minor": 0
219226
},

0 commit comments

Comments
 (0)