Convergence_detection: added new utility to merge result table

lib/convergence_detection.ml

@@ -39,10 +39,6 @@ type dataset_res = {
 }
 
 let merge_results ?fna_infos ~(res_by_tools : result list) () : text_file pworkflow =
-  let fna_infos = match fna_infos with
-    | Some (sw) -> sw
-    | _ -> None
-  in
   let command = List.map res_by_tools ~f:(fun res ->
       let w = match res with
         | `Pcoc d -> Pcoc.results d
@@ -78,7 +74,19 @@ let merge_results ?fna_infos ~(res_by_tools : result list) () : text_file pworkf
       file_dump (string Scripts.merge_det_results) ;
       opt "-o" ident dest ;
       seq ~sep:" " command ;
-      option( opt "--fna_infos" dep ) fna_infos;
+      option (opt "--fna_infos" dep) fna_infos;
+    ] ;
+  ]
+
+let merge_result_tables ?fna_infos ?oracle ?multinomial ?diffsel () : text_file pworkflow =
+  Workflow.shell ~descr:"convergence_detection.merge_results" [
+    cmd "python" ~img:Env.env_py [
+      file_dump (string Scripts.merge_det_results) ;
+      opt "-o" ident dest ;
+      option (opt "--multinomial" dep) multinomial ;
+      option (opt "--diffsel" dep) diffsel ;
+      option (opt "--oracle" dep) oracle ;
+      option (opt "--fna_infos" dep) fna_infos;
     ] ;
   ]
 

lib/convergence_detection.mli

@@ -27,11 +27,19 @@ type dataset_res = {
 }
 
 val merge_results :
-  ?fna_infos : text_file pworkflow option ->
+  ?fna_infos:text_file pworkflow ->
   res_by_tools : result list ->
   unit ->
   text_file pworkflow
 
+val merge_result_tables :
+  ?fna_infos:text_file pworkflow ->
+  ?oracle:text_file pworkflow ->
+  ?multinomial:text_file pworkflow ->
+  ?diffsel:text_file pworkflow ->
+  unit ->
+  text_file pworkflow
+
 val plot_merge_results :
   ? t_choices : text_file pworkflow ->
   plot_all_sites: bool ->

lib/pipeline.ml

@@ -211,7 +211,7 @@ let derive_from_dataset ~dataset ~preview ~use_diffsel ~use_c60=
       derive_from_det_meth ~det_meth ~dataset ~preview
     ) in
   let fna_infos = dataset.dataset.fna_infos in
-  let merged_results = merge_results ~fna_infos ~res_by_tools () in
+  let merged_results = merge_results ?fna_infos ~res_by_tools () in
   let tsv = merged_results in
   let faa = dataset.dataset.faa in
   let tree = Tree_dataset.tree dataset.dataset.tree_dataset `Detection in