Merge pull request #2648 from AllenInstitute/targeted_imaging_depth_t…

…o_oe_table Add targeted_imaging_depth column to get_ophys_experiment_table
AllenInstitute · Jan 23, 2023 · 045ec3c · 045ec3c
2 parents c07effe + 497bbc9
commit 045ec3c
Show file tree

Hide file tree

Showing 4 changed files with 1,950 additions and 1,945 deletions.
diff --git a/...rvatory/behavior/behavior_project_cache/project_apis/data_io/behavior_project_lims_api.py b/...rvatory/behavior/behavior_project_cache/project_apis/data_io/behavior_project_lims_api.py
@@ -359,7 +359,12 @@ def _get_ophys_experiment_table(self) -> pd.DataFrame:
  query += where_clause
 
  self.logger.debug(f"get_ophys_experiment_table query: \n{query}")
- return self.lims_engine.select(query)
+ query_df = self.lims_engine.select(query)
+ targeted_imaging_depth = query_df[
+ ["ophys_container_id", "imaging_depth"]
+ ].groupby("ophys_container_id").mean()
+ targeted_imaging_depth.columns = ['targeted_imaging_depth']
+ return query_df.merge(targeted_imaging_depth, on='ophys_container_id')
 
  def _get_ophys_cells_table(self):
  """

diff --git a/...rain_observatory/behavior/behavior_project_cache/test_behavior_project_metadata_writer.py b/...rain_observatory/behavior/behavior_project_cache/test_behavior_project_metadata_writer.py
@@ -118,7 +118,7 @@ def test_get_ophys_experiments_table(self):
  .sort_values('ophys_experiment_id')\
  .reset_index(drop=True)
  pd.testing.assert_frame_equal(
- obtained, expected)
+ obtained.sort_index(axis=1), expected.sort_index(axis=1))
 
  @pytest.mark.requires_bamboo
  def test_get_ophys_cells_table(self):