code cleanup

Author: Thinh Nguyen

element_array_ephys/ephys_acute.py

@@ -723,13 +723,9 @@ def make(self, key):
         metrics_df = pd.read_csv(metric_fp)
         metrics_df.set_index('cluster_id', inplace=True)
 
-        # Get all units
-        units = {u['unit']: u for u in (CuratedClustering.Unit & key).fetch(
-            'KEY', order_by='unit')}
-
         metrics_list = []
-        for unit, unit_key in units.items():
-            metrics_list.append({**unit_key, **dict(metrics_df.loc[unit])})
+        for unit_key in (CuratedClustering.Unit & key).fetch('KEY', order_by='unit'):
+            metrics_list.append({**unit_key, **dict(metrics_df.loc[unit_key['unit']])})
 
         self.insert1(key)
         self.Cluster.insert(metrics_list, ignore_extra_fields=True)

element_array_ephys/ephys_chronic.py

@@ -722,13 +722,9 @@ def make(self, key):
         metrics_df = pd.read_csv(metric_fp)
         metrics_df.set_index('cluster_id', inplace=True)
 
-        # Get all units
-        units = {u['unit']: u for u in (CuratedClustering.Unit & key).fetch(
-            'KEY', order_by='unit')}
-
         metrics_list = []
-        for unit, unit_key in units.items():
-            metrics_list.append({**unit_key, **dict(metrics_df.loc[unit])})
+        for unit_key in (CuratedClustering.Unit & key).fetch('KEY', order_by='unit'):
+            metrics_list.append({**unit_key, **dict(metrics_df.loc[unit_key['unit']])})
 
         self.insert1(key)
         self.Cluster.insert(metrics_list, ignore_extra_fields=True)