Fix prioritization of wash to disp

pharmbio · Feb 20, 2024 · 1aebf10 · 1aebf10
1 parent 803b8fa
commit 1aebf10
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/cellpainter/cellpainter/constraints.py b/cellpainter/cellpainter/constraints.py
@@ -2,6 +2,8 @@
 from typing import *
 from dataclasses import *
 
+import sys
+
 from .symbolic import Symbolic
 from .commands import *
 
@@ -46,7 +48,8 @@ def Opt(cmd: Command) -> Command:
             opt = optimal_env(cmd_inst)
             ends |= opt.expected_ends
             subst |= opt.env
-            pbutils.pr(opt)
+            print('... ', end='', file=sys.stderr, flush=True)
+            # pbutils.pr(opt)
             return cmd_inst.resolve(opt.env)
         else:
             return cmd

diff --git a/cellpainter/cellpainter/protocol.py b/cellpainter/cellpainter/protocol.py
@@ -38,13 +38,14 @@
 import pbutils
 
 class OptPrio:
-    incubation    = Min(priority=7, weight=1)
-    wash_to_disp  = Min(priority=6, weight=1)
-    incu_slack    = Min(priority=6, weight=1)
-    without_lid   = Min(priority=4, weight=1)
-    total_time    = Min(priority=3, weight=1)
-    squeeze_steps = Min(priority=2, weight=1)
-    inside_incu   = Max(priority=1, weight=0)
+    incubation    = Min(priority=8, weight=1)
+    wash_to_disp  = Min(priority=7, weight=1)
+    total_time    = Min(priority=6, weight=1)
+    without_lid   = Min(priority=5, weight=1)
+    inside_incu   = Max(priority=4, weight=1)
+    squeeze_steps = Min(priority=3, weight=1)
+
+    # incu_slack    = Min(priority=6, weight=1)
 
 @dataclass(frozen=True)
 class Plate:
@@ -535,6 +536,7 @@ def paint_batch(batch: list[Plate], protocol_config: ProtocolConfig) -> Command:
     ]
 
     post_cmds = [
+        Duration(f'batch {batch_index}', OptPrio.total_time),
     ]
 
     chunks: dict[Desc, Iterable[Command]] = {}
@@ -759,7 +761,11 @@ def paint_batch(batch: list[Plate], protocol_config: ProtocolConfig) -> Command:
                 Fork(
                     Seq(
                         *(wash_delay if not step.wash and not step.blue else []),
-                        Duration(f'{plate_desc} transfer {ix}', OptPrio.wash_to_disp),
+                        *(
+                            [Duration(f'{plate_desc} transfer {ix}', OptPrio.wash_to_disp)]
+                            if step.wash or step.blue else
+                            []
+                        ),
                         DispCmd('RunValidated', step.disp),
                         Checkpoint(f'{plate_desc} incubation {ix}'),
                     )