tweaks

csst_dag/cli/csst_msc_l1.py

+"""
+Aim
+---
+Process an MSC dataset, given a set of parameters.
+
+Example
+-------
+python -m csst_dag.cli.csst_msc_l1 -h
+
+python -m csst_dag.cli.csst_msc_l1
+    --dag csst-msc-l1-mbi csst-msc-l1-sls \
+    --dataset=csst-msc-c9-25sqdeg-v3 \
+    --instrument=MSC \
+    --obs-type=WIDE \
+    --obs-group=W1 \
+    --obs-id=10100232366 \
+    --detector=09 \
+    --prc-status=-1024 \
+    --batch-id=test-b1 \
+    --priority=1 \
+    --pmapname=csst_000070.pmap \
+    --ref-cat=trilegal_093 \
+    --submit
+"""
+
+from csst_dag.dag import CSST_DAGS, Dispatcher, BaseDAG
+from csst_dag import dfs
+import argparse
+
+parser = argparse.ArgumentParser(
+    description="Scheduler for CSST MSC L1 pipeline.",
+    formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+)
+
+# data parameters
+parser.add_argument("--dataset", type=str, help="Dataset name")
+parser.add_argument("--instrument", type=str, help="Instrument name", default=None)
+parser.add_argument("--obs-type", type=str, help="Observation type", default=None)
+parser.add_argument("--obs-group", type=str, help="Observation group", default=None)
+parser.add_argument("--obs-id", type=str, help="Observation ID", default=None)
+parser.add_argument("--detector", type=str, help="Detector name", default=None)
+parser.add_argument(
+    "prc-status", type=int, help="Initial processing status", default=-1024
+)
+# task parameters
+parser.add_argument("--batch-id", type=str, help="Batch ID", default="test-batch")
+parser.add_argument("--priority", type=str, help="Task priority", default=1)
+# DAG parameters
+parser.add_argument("--pmapname", type=str, help="CCDS pmapname", default="")
+parser.add_argument(
+    "--ref-cat", type=str, help="Reference catalog", default="trilegal_093"
+)
+# submit
+parser.add_argument("--submit", action="store_true", help="Push results", default=False)
+# post-processing parameters
+parser.add_argument(
+    "--final-prc-status", type=int, help="Final processing status", default=-2
+)
+
+args = parser.parse_args()
+
+
+# from csst_dag import DotDict
+#
+# args = DotDict(
+#     dataset="csst-msc-c9-25sqdeg-v3",
+#     instrument="MSC",
+#     obs_type="WIDE",
+#     obs_group="W2",
+#     obs_id="10100232366",
+#     detector=None,
+#     prc_status=None,
+#     batch_id="test-batch",
+#     priority=1,
+#     pmapname="csst_000070.pmap",
+#     ref_cat="trilegal_093",
+#     submit=False,
+# )
+
+print("CLI parameters: ", args)
+
+plan_basis, data_basis = Dispatcher.find_plan_level0_basis(
+    dataset=args.dataset,
+    instrument=args.instrument,
+    obs_type=args.obs_type,
+    obs_group=args.obs_group,
+    obs_id=args.obs_id,
+    detector=args.detector,
+    prc_status=args.prc_status,
+)
+print(f"{len(plan_basis)} plan basis, {len(data_basis)} data basis found")
+
+# generate DAG group run
+dag_group_run = BaseDAG.gen_dag_group_run(
+    dag_group="csst-msc-l1",
+    batch_id=args.batch_id,
+    priority=args.priority,
+)
+# generate DAG run list
+dag_run_list = CSST_DAGS["csst-msc-l1-mbi"].schedule(
+    dag_group_run=dag_group_run,
+    plan_basis=plan_basis,
+    data_basis=data_basis,
+    pmapname=args.pmapname,
+    ref_cat=args.ref_cat,
+)
+# # submit DAG group run
+# dfs.dag.new_dag_group_run(
+#     dag_group_run=dag_group_run,
+#     dag_run_list=dag_run_list,
+# )
+print("dag_group_run", dag_group_run)
+print("dag_run_list", dag_run_list[0])

csst_dag/dag/_dispatcher.py

@@ -197,7 +197,7 @@ class Dispatcher:
         return data_basis
 
     @staticmethod
-    def find_plan_level0_basis(**kwargs) -> tuple[table.Table]:
+    def find_plan_level0_basis(**kwargs) -> tuple[table.Table, table.Table]:
         data_basis = Dispatcher.find_level0_basis(**kwargs)
         plan_basis = Dispatcher.find_plan_basis(**kwargs)
         assert len(data_basis) > 0, data_basis
@@ -213,7 +213,7 @@ class Dispatcher:
         return relevant_plan, data_basis
 
     @staticmethod
-    def find_plan_level1_basis(**kwargs) -> tuple[table.Table]:
+    def find_plan_level1_basis(**kwargs) -> tuple[table.Table, table.Table]:
         data_basis = Dispatcher.find_level1_basis(**kwargs)
         plan_basis = Dispatcher.find_plan_basis(**kwargs)
         assert len(data_basis) > 0, data_basis