sort plan and data via obsid

csst_dag/dag/_base_dag.py

@@ -79,7 +79,7 @@ class BaseDAG:
             join_type="inner",
         )
         # sort via obs_id
-        filtered_data_basis.sort(keys=["dataset", "obs_id"])
+        filtered_data_basis.sort(keys=["dataset", "obs_id", "detector"])
         if len(filtered_data_basis) == 0:
             return plan_basis[:0], filtered_data_basis
         u_data_basis = table.unique(filtered_data_basis["dataset", "obs_id"])
@@ -89,6 +89,7 @@ class BaseDAG:
             keys=["dataset", "obs_id"],
             join_type="inner",
         )
+        filtered_plan_basis.sort(keys=["dataset", "obs_id"])
         return filtered_plan_basis, filtered_data_basis
 
     def schedule(

csst_dag/dag/_dispatcher.py

@@ -293,7 +293,7 @@ class Dispatcher:
         task_list = []
 
         # sort data_basis before dispatching
-        data_basis.sort(keys=data_basis.colnames)
+        data_basis.sort(keys=["dataset", "obs_id", "detector"])
 
         # loop over data
         for i_data_basis in trange(len(data_basis), **TQDM_KWARGS):