Skip to content

Commit

Permalink
Merge pull request #1749 from AllenInstitute/bugfix-LIMS_jobID_105618…
Browse files Browse the repository at this point in the history
…8052

WriteNWB Needs to be used by non-mesoscope data
  • Loading branch information
Matyasz authored Oct 13, 2020
2 parents fb96fc9 + fe71cd8 commit 7dd9dfe
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.

## [2.3.1] = 2020-10-13

### Bug Fixes
- (Internal) Fixed a write_nwb bug for behavior ophys experiments involving the BehaviorOphysJsonApi expecting a mesoscope-specific method.

## [2.3.0] = 2020-10-09

### Added
Expand Down
2 changes: 1 addition & 1 deletion allensdk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@



__version__ = '2.3.0'
__version__ = '2.3.1'


try:
Expand Down
11 changes: 9 additions & 2 deletions allensdk/brain_observatory/behavior/write_nwb/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@


class BehaviorOphysJsonApi(BehaviorOphysLimsApi):
"""
This class is used by both Scientifica and Mesoscope ophys experiments.
"""

def __init__(self, data):
self.data = data
Expand Down Expand Up @@ -96,7 +99,12 @@ def get_external_specimen_name(self):
return self.data['external_specimen_name']

def get_imaging_plane_group(self):
return self.data["imaging_plane_group"]
try:
# Will only contain the "imaging_plane_group" key if we are
# dealing with Mesoscope data
return self.data["imaging_plane_group"]
except KeyError:
return None


def write_behavior_ophys_nwb(session_data, nwb_filepath):
Expand All @@ -120,7 +128,6 @@ def write_behavior_ophys_nwb(session_data, nwb_filepath):
raise e



def main():

logging.basicConfig(format='%(asctime)s - %(process)s - %(levelname)s - %(message)s')
Expand Down
6 changes: 6 additions & 0 deletions doc_template/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ The Allen SDK provides Python code for accessing experimental metadata along wit
See the `mouse connectivity section <connectivity.html>`_ for more details.


What's New - 2.3.1 (October 13, 2020)
-----------------------------------------------------------------------
As of the 2.3.1 release:

- (Internal) Fixed a write_nwb bug for behavior ophys experiments involving the BehaviorOphysJsonApi expecting a mesoscope-specific method.

What's New - 2.3.0 (October 9, 2020)
-----------------------------------------------------------------------
As of the 2.3.0 release:
Expand Down

0 comments on commit 7dd9dfe

Please sign in to comment.