add input for pmapname

csst_dag/cli/msc_l1.py

@@ -13,18 +13,17 @@ python -m csst_dag.cli.msc_l1 \
     --dataset=csst-msc-c9-25sqdeg-v3 \
     --obs-type=WIDE \
     --obs-group=W1 \
-    --pmapname=csst_0000001.map \
     --initial-prc-status=-1024 \
     --final-prc-status=-2 \
     --demo
 
 python -m csst_dag.cli.msc_l1 \
-    --batch-id=1000sqdeg-test-b1 \
+    --batch-id=25sqdeg-test-b1 \
     --priority=1 \
     --dataset=csst-msc-c9-25sqdeg-v3 \
     --obs-type=WIDE \
     --obs-group=W1 \
-    --initial-prc-status=-1024 \
+    --initial-prc-status=-2 \
     --final-prc-status=-2
 """
 
@@ -84,6 +83,7 @@ for obs_type, dags in DAG_MAP.items():
             dataset=args.dataset,
             obs_type=obs_type,
             obs_group=args.obs_group,
+            pmapname=args.pmapname,
             initial_prc_status=args.initial_prc_status,
             final_prc_status=args.final_prc_status,
             demo=args.demo,

csst_dag/dag/dags.py

@@ -3,6 +3,7 @@ import json
 import numpy as np
 from csst_dfs_client import plan, level0
 
+from .._csst import csst, CsstPlanObsid, CsstPlanObsgroup
 from ._base_dag import BaseDAG
 from .._csst import csst
 
@@ -165,7 +166,7 @@ class GeneralDAGViaObsgroup(BaseDAG):
     def __init__(self, dag_group: str, dag: str, use_detector: bool = False):
         super().__init__(dag_group=dag_group, dag=dag, use_detector=use_detector)
         # set effective detector names
-        self.effective_detector_names = get_detector_names_via_dag(dag)
+        # self.effective_detector_names = get_detector_names_via_dag(dag)
 
     def schedule(
         self,
@@ -174,7 +175,7 @@ class GeneralDAGViaObsgroup(BaseDAG):
         dataset: str = "csst-msc-c9-25sqdeg-v3",
         obs_type: str = "WIDE",
         obs_group: str = "W1",
-        pmapname: str = "csst_000001.map",
+        pmapname: str = "csst_000001.pmap",
         initial_prc_status: int = -1024,  # level0 prc_status level1
         final_prc_status: int = -2,
         demo=True,
@@ -187,24 +188,45 @@ class GeneralDAGViaObsgroup(BaseDAG):
         )
         dag_run_list = []
 
+        instrument = "MSC"
+        obs_type = "BIAS"
+        obs_group = "bias-temperature-var"
+        dataset = "csst-msc-c9-ooc-v1"
+        initial_prc_status = -1024
+        final_prc_status = -2
+
         # find plan with compact mode
-        plan.count_plan_level0(
-            instrument=self.instrument,
+        qr_count = plan.count_plan_level0(
+            instrument=instrument,
             obs_type=obs_type,
             obs_group=obs_group,
             dataset=dataset,
             prc_status=initial_prc_status,
         )
-        res_plan_level0 = plan.count_plan_level0(
-            instrument="MSC",
-            obs_type="WIDE",
-            obs_group="W1",
-            dataset="csst-msc-c9-25sqdeg-v3",
-            prc_status=-1024,
+        assert qr_count.success, qr_count
+        n_plan = qr_count.data["plan_count"]
+        n_level0 = qr_count.data["level0_count"]
+        assert n_plan > 0, f"No plan found for {obs_type} {obs_group} {dataset}"
+        assert (
+            n_level0 > 0
+        ), f"No level0 record found for {obs_type} {obs_group} {dataset}"
+
+        # find plan and level0 data
+        qr_plan = plan.find(
+            instrument=instrument,
+            obs_type=obs_type,
+            obs_group=obs_group,
+            dataset=dataset,
+        )
+        qr_level0 = level0.find(
+            instrument=instrument,
+            obs_type=obs_type,
+            obs_group=obs_group,
+            dataset=dataset,
+            prc_status=initial_prc_status,
         )
-        assert res_plan_level0.success, res_plan_level0
-        n_plan = res_plan_level0.data["plan_count"]
-        n_level0 = res_plan_level0.data["level0_count"]
+
+        obs_group = CsstPlanObsgroup.from_plan(qr_plan.data)
 
         # find level0 records
         if n_plan == 0: