Skip to content

Commit 8fe4556

Browse files
authored
Merge pull request #1028 from AllenInstitute/fix-msa-name
Fix msa name
2 parents e535135 + fc5e481 commit 8fe4556

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

allensdk/brain_observatory/ecephys/ecephys_project_cache.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def get_all_genotypes(self, **session_kwargs):
283283
return self._get_all_values("genotype", self.get_sessions, **session_kwargs)
284284

285285
def get_all_recorded_structures(self, **channel_kwargs):
286-
return self._get_all_values("manual_structure_acronym", self.get_channels, **channel_kwargs)
286+
return self._get_all_values("structure_acronym", self.get_channels, **channel_kwargs)
287287

288288
def get_all_project_codes(self):
289289
return self._get_all_values("project_code", self.get_sessions, **session_kwargs)
@@ -476,4 +476,4 @@ def get_grouped_uniques(this, other, foreign_key, field_key, unique_key, inplace
476476

477477
if not inplace:
478478
return this
479-
479+

allensdk/test/brain_observatory/ecephys/test_ecephys_session.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,7 @@ def test_filter_owned_df_scalar(just_stimulus_table_api):
400400
session = EcephysSession(api=just_stimulus_table_api)
401401
ids = 3
402402

403-
with pytest.warns(UserWarning) as w:
404-
obtained = session._filter_owned_df('stimulus_presentations', ids)
405-
406-
assert w[-1].message.args[0] == 'a scalar (3) was provided as ids, filtering to a single row of stimulus_presentations.'
403+
obtained = session._filter_owned_df('stimulus_presentations', ids)
407404
assert obtained['phase'].values[0] == 180
408405

409406

0 commit comments

Comments
 (0)