Skip to content

Commit 7128acc

Browse files
committed
Merge remote-tracking branch 'upstream/main' into dev_new_main
2 parents 40dc3c0 + 626327c commit 7128acc

File tree

7 files changed

+2565
-147
lines changed

7 files changed

+2565
-147
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: devcontainer_build_publish
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
call_devcontainer_build_publish:
7+
uses: datajoint/.github/.github/workflows/devcontainer-build-publish.yaml@main
8+
secrets:
9+
DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
10+
DOCKERHUB_TOKEN: ${{secrets.DOCKERHUB_TOKEN_FOR_ELEMENTS}}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: mkdocs-release
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
mkdocs_release:
7+
uses: datajoint/.github/.github/workflows/mkdocs_release.yaml@main
8+
permissions:
9+
contents: write
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: semantic-release
2+
on:
3+
workflow_dispatch:
4+
5+
jobs:
6+
call_semantic_release:
7+
uses: datajoint/.github/.github/workflows/semantic-release.yaml@main
8+
secrets:
9+
APP_ID: ${{ secrets.ELEMENT_APP_ID }}
10+
GET_TOKEN_KEY: ${{ secrets.ELEMENT_GET_TOKEN_KEY }}

CHANGELOG.md

Lines changed: 2531 additions & 136 deletions
Large diffs are not rendered by default.

element_array_ephys/ephys.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,7 @@ def auto_generate_entries(cls, session_key):
177177
"probe_type": spikeglx_meta.probe_model,
178178
"probe": spikeglx_meta.probe_SN,
179179
}
180-
if (
181-
probe_key["probe"] not in [p["probe"] for p in probe_list]
182-
and probe_key not in probe.Probe()
183-
):
180+
if probe_key["probe"] not in [p["probe"] for p in probe_list]:
184181
probe_list.append(probe_key)
185182

186183
probe_dir = meta_filepath.parent
@@ -204,10 +201,7 @@ def auto_generate_entries(cls, session_key):
204201
"probe_type": oe_probe.probe_model,
205202
"probe": oe_probe.probe_SN,
206203
}
207-
if (
208-
probe_key["probe"] not in [p["probe"] for p in probe_list]
209-
and probe_key not in probe.Probe()
210-
):
204+
if probe_key["probe"] not in [p["probe"] for p in probe_list]:
211205
probe_list.append(probe_key)
212206
probe_insertion_list.append(
213207
{

element_array_ephys/readers/spikeglx.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ def get_channel_bit_volts(self, band="ap"):
9696
dataVolts = dataInt * Vmax / Imax / gain
9797
"""
9898
vmax = float(self.apmeta.meta["imAiRangeMax"])
99+
imax = self.apmeta.meta.get("imMaxInt")
100+
imax = float(imax) if imax else IMAX[self.apmeta.probe_model]
99101

100102
if band == "ap":
101-
imax = IMAX[self.apmeta.probe_model]
102103
imroTbl_data = self.apmeta.imroTbl["data"]
103104
imroTbl_idx = 3
104105
chn_ind = self.apmeta.get_recording_channels_indices(exclude_sync=True)
105106

106107
elif band == "lf":
107-
imax = IMAX[self.lfmeta.probe_model]
108108
imroTbl_data = self.lfmeta.imroTbl["data"]
109109
imroTbl_idx = 4
110110
chn_ind = self.lfmeta.get_recording_channels_indices(exclude_sync=True)

element_array_ephys/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""Package metadata."""
22

3-
__version__ = "1.0.0"
3+
__version__ = "4.0.0"

0 commit comments

Comments
 (0)