Improve n/a cell line handling for DIP rate

alubbock · May 16, 2019 · c16f9cd · c16f9cd
1 parent 038dda4
commit c16f9cd
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/thunor/dip.py b/thunor/dip.py
@@ -53,15 +53,23 @@ def dip_rates(df_data, selector_fn=tyson1):
         Two entry list, giving control DIP rates and experiment
         (non-control) DIP rates (both as Pandas DataFrames)
     """
-    if df_data.controls is None:
+    if df_data.controls is None or df_data.controls.empty:
         ctrl_dips = None
     else:
         if 'dataset' in df_data.controls.index.names:
             df_controls = df_data.controls.loc[(slice(None),
                                                 df_data.dip_assay_name), :]
         else:
             df_controls = df_data.controls.loc[df_data.dip_assay_name]
-        ctrl_dips = ctrl_dip_rates(df_controls)
+        df_controls = df_controls.loc[df_controls.index.dropna()]
+        if df_controls.empty:
+            ctrl_dips = None
+        else:
+            ctrl_dips = ctrl_dip_rates(df_controls)
+
+    if df_data.assays.empty:
+        return ctrl_dips, None
+
     df_assays = df_data.assays.loc[df_data.dip_assay_name]
 
     return ctrl_dips, \