Preparing everything for this weekend's run.

.gitignore

@@ -2,6 +2,7 @@
 _build
 _bistro
 outdir*
+run*
 reviewphiltrans.install
 **/.merlin
 example/outdir

Makefile

@@ -74,7 +74,11 @@ real:
 .PHONY: analyses_we
 analyses_we:
 	cd example && \
-	reviewphiltrans validation --outdir outdir_analyses_we_0914 --tree-dir trees_analyses_weekend --profile-fn aa_fitness/263SelectedProfiles.tsv --np 24 --ns 2000 --seed 2167988076475850536
+	reviewphiltrans validation --outdir outdir_analyses_we_0914 --tree-dir trees_analyses_weekend --profile-fn aa_fitness/263SelectedProfiles.tsv --np 24 --ns 2000 --seed 2167988076475850536 ; \
+	reviewphiltrans validation --outdir outdir_analyses_we_0914 --tree-dir trees_analyses_weekend --profile-fn aa_fitness/263SelectedProfiles.tsv --np 24 --ns 2000 --seed 2167988076475850536 --diffsel ; \
+	cp trees4analyses_db/orthomam* trees_analyses_weekend/ ; \
+	reviewphiltrans validation --outdir outdir_analyses_we_0914 --tree-dir trees_analyses_weekend --profile-fn aa_fitness/263SelectedProfiles.tsv --np 24 --ns 2000 --seed 2167988076475850536 ; \
+	reviewphiltrans validation --outdir outdir_analyses_we_0914 --tree-dir trees_analyses_weekend --profile-fn aa_fitness/263SelectedProfiles.tsv --np 24 --ns 2000 --seed 2167988076475850536 --c60
 
 # -----------------------------------------------------------------------
 #   Cleaning and formatting

lib/pipeline.ml

@@ -90,10 +90,12 @@ let derive_from_tree ~tree_dir ~tree ~profile ~preview ~use_concat ~ns ~no_Ne ~n
   (* let dataset_basis_hyps = [dataset_H0_NeG5; dataset_HaPCOC; dataset_HaPC_NeG5] in *)
   let nes_list =
     [Fixed 4.] @ if preview then [] else 
-      [Fixed 1.; Fixed 2.; Fixed 6.;
-       Variable (1., 4.); Variable (2., 4.); Variable (4., 1.); Variable (4., 2.); Variable (4., 6.); Variable (4., 8.)]
+      [Fixed 1.; Fixed 8.; Fixed 16.; (* 4->8, 8->4, 8, 16 and 16->1 are new ; it means 5*2*2 tasks on cyp/C4A *)
+       Variable (1., 4.); Variable (4., 1.);
+       Variable (4., 8.); Variable (8., 4.);
+       Variable (16., 1.);
+       ]
   in
-
   let models = h0_hapc_forall nes_list in
   let dataset_per_hypo = List.map models ~f:(fun model ->
       derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~preview ~ns ~seed