Skip to content
GitLab
Commit 6ea633ba authored by BO ZHANG's avatar BO ZHANG 🏀
Browse files

add comment in DAG messages

parent cbb7535e
Hide whitespace changes
Inline Side-by-side
csst_dag/dag/_dispatcher.py
View file @ 6ea633ba
...@@ -274,6 +274,8 @@ class Dispatcher: ...@@ -274,6 +274,8 @@ class Dispatcher:
join_type="inner", join_type="inner",
table_names=["data", "plan"], table_names=["data", "plan"],
) )
# set comment
this_task["comment"] = "n_file_expected = 1, n_file_found = 1"
# append this task # append this task
task_list.append( task_list.append(
dict( dict(
...@@ -380,12 +382,16 @@ class Dispatcher: ...@@ -380,12 +382,16 @@ class Dispatcher:
this_detector in csst[this_instrument].effective_detector_names this_detector in csst[this_instrument].effective_detector_names
) )
n_files_expected = ( n_file_expected = (
this_data_detector_plan["n_frame"][0] this_data_detector_plan["n_frame"][0]
if len(this_data_detector_plan) > 0 if len(this_data_detector_plan) > 0
else 0 else 0
) )
n_files_found = len(this_data_detector_files) n_file_found = len(this_data_detector_files)
# set comment
this_task["comment"] = (
f"n_file_expected = {n_file_expected}, n_file_found = {n_file_found}"
)
# append this task # append this task
task_list.append( task_list.append(
dict( dict(
...@@ -394,7 +400,7 @@ class Dispatcher: ...@@ -394,7 +400,7 @@ class Dispatcher:
len(this_data_detector_plan) == 1 len(this_data_detector_plan) == 1
and len(this_data_detector_files) == 1 and len(this_data_detector_files) == 1
and this_detector_effective and this_detector_effective
and n_files_found == n_files_expected and n_file_found == n_file_expected
), ),
relevant_plan=this_data_detector_plan, relevant_plan=this_data_detector_plan,
relevant_data=this_data_detector_files, relevant_data=this_data_detector_files,
...@@ -505,6 +511,12 @@ class Dispatcher: ...@@ -505,6 +511,12 @@ class Dispatcher:
this_data_obsid_file["detector"] this_data_obsid_file["detector"]
) )
n_file_expected = this_data_obsid_plan["n_frame"].sum()
n_file_found = len(this_data_obsid_file)
# set comment
this_task["comment"] = (
f"n_file_expected = {n_file_expected}, n_file_found = {n_file_found}"
)
# append this task # append this task
task_list.append( task_list.append(
dict( dict(
...@@ -601,6 +613,12 @@ class Dispatcher: ...@@ -601,6 +613,12 @@ class Dispatcher:
this_obsgroup_obsid_file["detector"] this_obsgroup_obsid_file["detector"]
) )
n_file_expected = this_obsgroup_plan["n_frame"].sum()
n_file_found = len(this_obsgroup_file)
# set comment
this_task["comment"] = (
f"n_file_expected = {n_file_expected}, n_file_found = {n_file_found}"
)
# append this task # append this task
task_list.append( task_list.append(
dict( dict(
......
csst_dag/dag_config/csst-cpic-l1-qc0.json
View file @ 6ea633ba
...@@ -10,5 +10,6 @@ ...@@ -10,5 +10,6 @@
"obs_group": "none", "obs_group": "none",
"obs_id": "40100000001", "obs_id": "40100000001",
"detector": "VIS", "detector": "VIS",
"pmapname": "" "pmapname": "",
"comment": ""
} }
\ No newline at end of file
csst_dag/dag_config/csst-cpic-l1.json
View file @ 6ea633ba
...@@ -10,5 +10,6 @@ ...@@ -10,5 +10,6 @@
"obs_group": "none", "obs_group": "none",
"obs_id": "40100000001", "obs_id": "40100000001",
"detector": "VIS", "detector": "VIS",
"pmapname": "" "pmapname": "",
"comment": ""
} }
csst_dag/dag_config/csst-hstdm-l1.json
View file @ 6ea633ba
...@@ -8,5 +8,6 @@ ...@@ -8,5 +8,6 @@
"dataset": "csst-hstdm-c11-stare-sis1-v1", "dataset": "csst-hstdm-c11-stare-sis1-v1",
"obs_type": "STARE", "obs_type": "STARE",
"obs_group": "", "obs_group": "",
"pmapname": "" "pmapname": "",
"comment": ""
} }
csst_dag/dag_config/csst-ifs-l1-qc0.json
View file @ 6ea633ba
...@@ -12,5 +12,6 @@ ...@@ -12,5 +12,6 @@
"obs_id": "", "obs_id": "",
"detector": "B", "detector": "B",
"pmapname": "", "pmapname": "",
"ref_cat": "" "ref_cat": "",
"comment": ""
} }
csst_dag/dag_config/csst-ifs-l1-rss.json
View file @ 6ea633ba
...@@ -12,5 +12,6 @@ ...@@ -12,5 +12,6 @@
"obs_id": "", "obs_id": "",
"detector": "B", "detector": "B",
"pmapname": "", "pmapname": "",
"ref_cat": "" "ref_cat": "",
"comment": ""
} }
csst_dag/dag_config/csst-mci-l1.json
View file @ 6ea633ba
...@@ -12,5 +12,6 @@ ...@@ -12,5 +12,6 @@
"obs_id": "20100000001", "obs_id": "20100000001",
"detector": "C1", "detector": "C1",
"pmapname": "", "pmapname": "",
"ref_cat": "" "ref_cat": "",
"comment": ""
} }
csst_dag/dag_config/csst-msc-l1-ast.json
View file @ 6ea633ba
...@@ -12,5 +12,6 @@ ...@@ -12,5 +12,6 @@
"obs_id": "10100232366", "obs_id": "10100232366",
"detector": "09", "detector": "09",
"pmapname": "", "pmapname": "",
"ref_cat": "" "ref_cat": "",
"comment": ""
} }
csst_dag/dag_config/csst-msc-l1-mbi.json
View file @ 6ea633ba
...@@ -12,5 +12,6 @@ ...@@ -12,5 +12,6 @@
"obs_id": "10100232366", "obs_id": "10100232366",
"detector": "09", "detector": "09",
"pmapname": "", "pmapname": "",
"ref_cat": "" "ref_cat": "",
"comment": ""
} }
csst_dag/dag_config/csst-msc-l1-ooc.json
View file @ 6ea633ba
...@@ -9,5 +9,6 @@ ...@@ -9,5 +9,6 @@
"obs_type": "BIAS", "obs_type": "BIAS",
"obs_group": "bias-temperature-var", "obs_group": "bias-temperature-var",
"detector": "09", "detector": "09",
"pmapname": "" "pmapname": "",
"comment": ""
} }
csst_dag/dag_config/csst-msc-l1-qc0.json
View file @ 6ea633ba
...@@ -12,5 +12,6 @@ ...@@ -12,5 +12,6 @@
"obs_id": "10100232366", "obs_id": "10100232366",
"detector": "09", "detector": "09",
"pmapname": "", "pmapname": "",
"ref_cat": "" "ref_cat": "",
"comment": ""
} }
csst_dag/dag_config/csst-msc-l1-sls.json
View file @ 6ea633ba
...@@ -12,5 +12,6 @@ ...@@ -12,5 +12,6 @@
"obs_id": "10100232366", "obs_id": "10100232366",
"detector": "09", "detector": "09",
"pmapname": "", "pmapname": "",
"ref_cat": "" "ref_cat": "",
"comment": ""
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment