Merge pull request #93 from CardiacModelling/js_fix_passed_wells

Account for "QC_R_leftover" in passed_wells

Author: joeyshuttleworth

pcpostprocess/scripts/run_herg_qc.py

@@ -314,6 +314,15 @@ def main():
         passed_QC_Erev_spread = E_rev_spread <= args.reversal_spread_threshold
         logging.info(f"passed_QC_Erev_spread {passed_QC_Erev_spread}")
 
+        # R_leftover only considered for protocols used for QC (i.e. staircase protocols)
+        passed_QC_R_leftover = np.all(sub_df[sub_df.protocol.isin(args.D2SQC.values())]
+                                      ["R_leftover"].values
+                                      )
+
+        logging.info(f"passed_QC_R_leftover {passed_QC_R_leftover}")
+
+        passed_QC_Erev_spread = E_rev_spread <= args.reversal_spread_threshold
+
         qc_erev_spread[well] = passed_QC_Erev_spread
         erev_spreads[well] = E_rev_spread
 
@@ -323,9 +332,9 @@ def main():
         was_selected = np.all(sub_df['selected'].values)
 
         passed_qc = passed_qc3_bookend and was_selected\
-            and passed_QC_Erev_all and passed_QC6_all\
-            and passed_QC_Erev_spread and passed_QC1_all\
-            and passed_QC4_all
+            and passed_QC_Erev_all and passed_QC1_all\
+            and passed_QC_Erev_spread and passed_QC4_all\
+            and passed_QC6_all and passed_QC_R_leftover
 
         passed_qc_dict[well] = passed_qc