obs_group

csst_dag/cli/cpic.py

@@ -7,7 +7,7 @@ Example
 -------
 python -m csst_dag.cli.cpic \
     --dataset=csst-cpic-c11-hip71681-v1 \
-    --project-id=none \
+    --obs-group=hip71681 \
     --batch-id=csci-test-20250507 \
     --priority=1 \
     --initial-prc-status=-1024 \
@@ -24,7 +24,7 @@ parser = argparse.ArgumentParser(
 
 parser.add_argument("--dataset", type=str, help="Dataset name")
 # parser.add_argument("--instrument", type=str, help="Instrument name", default="CPIC")
-parser.add_argument("--project-id", type=str, help="Project ID", default="none")
+parser.add_argument("--obs-group", type=str, help="Observation group", default="none")
 parser.add_argument("--obs-type", type=str, help="Observation type", default="")
 parser.add_argument("--batch-id", type=str, help="Batch ID", default="default_batch")
 parser.add_argument("--priority", type=str, help="Task priority", default=1)
@@ -60,7 +60,7 @@ for obs_type, dag_ids in DAG_LOOP_MAP.items():
         msgs = dag.schedule(
             dataset=args.dataset,
             obs_type=obs_type,
-            project_id=args.project_id,
+            obs_group=args.obs_group,
             batch_id=args.batch_id,
             initial_prc_status=args.initial_prc_status,
             final_prc_status=args.final_prc_status,

csst_dag/cli/msc.py

@@ -7,7 +7,7 @@ Example
 -------
 python -m csst_dag.cli.msc \
     --dataset=csst-msc-c9-25sqdeg-v3 \
-    --project-id=none \
+    --obs-group=none \
     --batch-id=csci-test-20250507 \
     --priority=1 \
     --initial-prc-status=-1024 \
@@ -24,7 +24,7 @@ parser = argparse.ArgumentParser(
 
 parser.add_argument("--dataset", type=str, help="Dataset name")
 # parser.add_argument("--instrument", type=str, help="Instrument name", default="MSC")
-parser.add_argument("--project-id", type=str, help="Project ID", default="none")
+parser.add_argument("--obs-group", type=str, help="Observation group", default="none")
 parser.add_argument("--obs-type", type=str, help="Observation type", default="")
 parser.add_argument("--batch-id", type=str, help="Batch ID", default="default_batch")
 parser.add_argument("--priority", type=str, help="Task priority", default=1)
@@ -57,7 +57,7 @@ for obs_type, dag_ids in DAG_LOOP_MAP.items():
         msgs = dag.schedule(
             dataset=args.dataset,
             obs_type=obs_type,
-            project_id=args.project_id,
+            obs_group=args.obs_group,
             batch_id=args.batch_id,
             initial_prc_status=args.initial_prc_status,
             final_prc_status=args.final_prc_status,

csst_dag/dag/l1.py

@@ -13,9 +13,9 @@ DAG_PARAMS = {
     "csst-msc-l1-mbi": {
         "instrument": "MSC",
         "additional_keys": {
-            "chip_id": {
-                "key_in_dfs": "detector_no",
-                "key_in_dag": "chip_id",
+            "detector": {
+                "key_in_dfs": "detector",
+                "key_in_dag": "detector",
                 "enum": [
                     "06",
                     "07",
@@ -42,9 +42,9 @@ DAG_PARAMS = {
     "csst-msc-l1-sls": {
         "instrument": "MSC",
         "additional_keys": {
-            "chip_id": {
-                "key_in_dfs": "detector_no",
-                "key_in_dag": "chip_id",
+            "detector": {
+                "key_in_dfs": "detector",
+                "key_in_dag": "detector",
                 "enum": [
                     "01",
                     "02",
@@ -65,9 +65,9 @@ DAG_PARAMS = {
     "csst-msc-l1-qc0": {
         "instrument": "MSC",
         "additional_keys": {
-            "chip_id": {
-                "key_in_dfs": "detector_no",
-                "key_in_dag": "chip_id",
+            "detector": {
+                "key_in_dfs": "detector",
+                "key_in_dag": "detector",
                 "enum": [
                     "01",
                     "02",
@@ -106,20 +106,24 @@ DAG_PARAMS = {
     "csst-cpic-l1": {
         "instrument": "CPIC",
         "additional_keys": {
-            "camera": {
-                "key_in_dfs": "detector_no",
-                "key_in_dag": "camera",
-                "enum": ["VIS"],
+            "detector": {
+                "key_in_dfs": "detector",
+                "key_in_dag": "detector",
+                "enum": [
+                    "VIS",
+                ],
             },
         },
     },
     "csst-cpic-l1-qc0": {
         "instrument": "CPIC",
         "additional_keys": {
-            "camera": {
-                "key_in_dfs": "detector_no",
-                "key_in_dag": "camera",
-                "enum": ["VIS"],
+            "detector": {
+                "key_in_dfs": "detector",
+                "key_in_dag": "detector",
+                "enum": [
+                    "VIS",
+                ],
             },
         },
     },
@@ -138,15 +142,18 @@ class CsstL1(BaseDAG):
         self,
         dataset: str = "csst-msc-c9-25sqdeg-v3",
         obs_type: str = "WIDE",
-        project_id="none",
+        obs_group="none",
         batch_id: str | None = "default",
-        initial_prc_status: int = -1024,
+        initial_prc_status: int = -1024,  # level0 prc_status level1
         final_prc_status: int = -2,
         demo=True,
         **kwargs,
     ):
         assert kwargs.keys() <= SCHEDULE_KWARGS, f"Unknown kwargs: {kwargs.keys()}"
         # no need to query plan
+
+        #
+        plan.write_file(local_path="plan.json")
         # plan.find(
         #     instrument="MSC",
         #     dataset=dataset,
@@ -159,7 +166,7 @@ class CsstL1(BaseDAG):
             instrument=self.params["instrument"],
             dataset=dataset,
             obs_type=obs_type,
-            project_id=project_id,
+            obs_group=obs_group,
             prc_status=initial_prc_status,
         )
         assert recs.success, recs.message
@@ -180,7 +187,7 @@ class CsstL1(BaseDAG):
                 this_msg = self.gen_msg(
                     dataset=dataset,
                     obs_type=obs_type,
-                    project_id=project_id,
+                    obs_group=obs_group,
                     batch_id=batch_id,
                     obs_id=this_rec["obs_id"],
                     # chip_id=this_rec["detector_no"],

csst_dag/dag_config/csst-cpic-l1-qc0.json

@@ -4,7 +4,7 @@
     "dag_run_id": "csst-cpic-l1-qc0-inttest",
     "dataset": "csst-cpic-c11-hip71681-v1",
     "obs_type": "SCI",
-    "project_id": "none",
+    "obs_group": "none",
     "obs_id": "40100000001",
     "detector": "VIS",
     "batch_id": "inttest"

csst_dag/dag_config/csst-cpic-l1.json

@@ -4,8 +4,8 @@
     "dag_run_id": "csst-cpic-l1-inttest",
     "dataset": "csst-cpic-c11-hip71681-v1",
     "obs_type": "SCI",
-    "project_id": "none",
+    "obs_group": "none",
     "obs_id": "40100000001",
-    "camera": "VIS",
+    "detector": "VIS",
     "batch_id": "inttest"
 }

csst_dag/dag_config/csst-msc-l1-mbi.json

@@ -4,7 +4,7 @@
     "dag_run_id": "csst-msc-l1-mbi-inttest",
     "dataset": "csst-msc-c9-25sqdeg-v3",
     "obs_type": "WIDE",
-    "project_id": "none",
+    "obs_group": "none",
     "obs_id": "10100232366",
     "detector": "09",
     "batch_id": "inttest"

csst_dag/dag_config/csst-msc-l1-qc0.json

@@ -4,7 +4,7 @@
     "dag_run_id": "csst-msc-l1-qc0-inttest",
     "dataset": "csst-msc-c9-25sqdeg-v3",
     "obs_type": "BIAS",
-    "project_id": "none",
+    "obs_group": "none",
     "obs_id": "10100232366",
     "detector": "01",
     "batch_id": "inttest"

csst_dag/dag_config/csst-msc-l1-sls.json

@@ -4,7 +4,7 @@
     "dag_run_id": "csst-msc-l1-sls-inttest",
     "dataset": "csst-msc-c9-25sqdeg-v3",
     "obs_type": "WIDE",
-    "project_id": "none",
+    "obs_group": "none",
     "obs_id": "10100232366",
     "detector": "01",
     "batch_id": "inttest"