Merge pull request #2468 from AllenInstitute/ticket/2306

tolist() can be expensive; use list comprehension instead which is fas…
AllenInstitute · Jun 9, 2022 · 6f74fdc · 6f74fdc
2 parents fdcdec1 + 67a59ae
commit 6f74fdc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/..._observatory/behavior/data_objects/cell_specimens/traces/corrected_fluorescence_traces.py b/..._observatory/behavior/data_objects/cell_specimens/traces/corrected_fluorescence_traces.py
@@ -42,7 +42,7 @@ def from_nwb(cls, nwbfile: NWBFile) \
         # We want rois x timepoints, hence the transpose
         f_traces = corr_fluorescence_nwb.data[:].T.copy()
         roi_ids = corr_fluorescence_nwb.rois.table.id[:].copy()
-        df = pd.DataFrame({'corrected_fluorescence': f_traces.tolist()},
+        df = pd.DataFrame({'corrected_fluorescence': [x for x in f_traces]},
                           index=pd.Index(
                               data=roi_ids,
                               name='cell_roi_id'))

diff --git a/allensdk/brain_observatory/behavior/data_objects/cell_specimens/traces/dff_traces.py b/allensdk/brain_observatory/behavior/data_objects/cell_specimens/traces/dff_traces.py
@@ -71,7 +71,7 @@ def from_nwb(cls, nwbfile: NWBFile) -> "DFFTraces":
         # We want rois x timepoints, hence the transpose
         dff_traces = dff_nwb.data[:].T
 
-        df = pd.DataFrame({'dff': dff_traces.tolist()},
+        df = pd.DataFrame({'dff': [x for x in dff_traces]},
                           index=pd.Index(data=dff_nwb.rois.table.id[:],
                                          name='cell_roi_id'))
         return DFFTraces(traces=df)