Skip to content
GitLab
Commit 2f7c491e authored by BO ZHANG's avatar BO ZHANG 🏀
Browse files

append n_file_expected and n_file_found to DAG messages instead of comments

parent 6ea633ba
Hide whitespace changes
Inline Side-by-side
csst_dag/dag/_dispatcher.py
View file @ 2f7c491e
...@@ -274,8 +274,9 @@ class Dispatcher: ...@@ -274,8 +274,9 @@ class Dispatcher:
join_type="inner", join_type="inner",
table_names=["data", "plan"], table_names=["data", "plan"],
) )
# set comment # set n_file_expected and n_file_found
this_task["comment"] = "n_file_expected = 1, n_file_found = 1" this_task["n_file_expected"] = 1
this_task["n_file_found"] = 1
# append this task # append this task
task_list.append( task_list.append(
dict( dict(
...@@ -388,10 +389,9 @@ class Dispatcher: ...@@ -388,10 +389,9 @@ class Dispatcher:
else 0 else 0
) )
n_file_found = len(this_data_detector_files) n_file_found = len(this_data_detector_files)
# set comment # set n_file_expected and n_file_found
this_task["comment"] = ( this_task["n_file_expected"] = n_file_expected
f"n_file_expected = {n_file_expected}, n_file_found = {n_file_found}" this_task["n_file_found"] = n_file_found
)
# append this task # append this task
task_list.append( task_list.append(
dict( dict(
...@@ -513,10 +513,9 @@ class Dispatcher: ...@@ -513,10 +513,9 @@ class Dispatcher:
n_file_expected = this_data_obsid_plan["n_frame"].sum() n_file_expected = this_data_obsid_plan["n_frame"].sum()
n_file_found = len(this_data_obsid_file) n_file_found = len(this_data_obsid_file)
# set comment # set n_file_expected and n_file_found
this_task["comment"] = ( this_task["n_file_expected"] = n_file_expected
f"n_file_expected = {n_file_expected}, n_file_found = {n_file_found}" this_task["n_file_found"] = n_file_found
)
# append this task # append this task
task_list.append( task_list.append(
dict( dict(
...@@ -615,10 +614,9 @@ class Dispatcher: ...@@ -615,10 +614,9 @@ class Dispatcher:
n_file_expected = this_obsgroup_plan["n_frame"].sum() n_file_expected = this_obsgroup_plan["n_frame"].sum()
n_file_found = len(this_obsgroup_file) n_file_found = len(this_obsgroup_file)
# set comment # set n_file_expected and n_file_found
this_task["comment"] = ( this_task["n_file_expected"] = n_file_expected
f"n_file_expected = {n_file_expected}, n_file_found = {n_file_found}" this_task["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 @ 2f7c491e
...@@ -11,5 +11,6 @@ ...@@ -11,5 +11,6 @@
"obs_id": "40100000001", "obs_id": "40100000001",
"detector": "VIS", "detector": "VIS",
"pmapname": "", "pmapname": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
\ No newline at end of file
csst_dag/dag_config/csst-cpic-l1.json
View file @ 2f7c491e
...@@ -11,5 +11,6 @@ ...@@ -11,5 +11,6 @@
"obs_id": "40100000001", "obs_id": "40100000001",
"detector": "VIS", "detector": "VIS",
"pmapname": "", "pmapname": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
csst_dag/dag_config/csst-hstdm-l1.json
View file @ 2f7c491e
...@@ -9,5 +9,6 @@ ...@@ -9,5 +9,6 @@
"obs_type": "STARE", "obs_type": "STARE",
"obs_group": "", "obs_group": "",
"pmapname": "", "pmapname": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
csst_dag/dag_config/csst-ifs-l1-qc0.json
View file @ 2f7c491e
...@@ -13,5 +13,6 @@ ...@@ -13,5 +13,6 @@
"detector": "B", "detector": "B",
"pmapname": "", "pmapname": "",
"ref_cat": "", "ref_cat": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
csst_dag/dag_config/csst-ifs-l1-rss.json
View file @ 2f7c491e
...@@ -13,5 +13,6 @@ ...@@ -13,5 +13,6 @@
"detector": "B", "detector": "B",
"pmapname": "", "pmapname": "",
"ref_cat": "", "ref_cat": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
csst_dag/dag_config/csst-mci-l1.json
View file @ 2f7c491e
...@@ -13,5 +13,6 @@ ...@@ -13,5 +13,6 @@
"detector": "C1", "detector": "C1",
"pmapname": "", "pmapname": "",
"ref_cat": "", "ref_cat": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
csst_dag/dag_config/csst-msc-l1-ast.json
View file @ 2f7c491e
...@@ -13,5 +13,6 @@ ...@@ -13,5 +13,6 @@
"detector": "09", "detector": "09",
"pmapname": "", "pmapname": "",
"ref_cat": "", "ref_cat": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
csst_dag/dag_config/csst-msc-l1-mbi.json
View file @ 2f7c491e
...@@ -13,5 +13,6 @@ ...@@ -13,5 +13,6 @@
"detector": "09", "detector": "09",
"pmapname": "", "pmapname": "",
"ref_cat": "", "ref_cat": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
csst_dag/dag_config/csst-msc-l1-ooc.json
View file @ 2f7c491e
...@@ -10,5 +10,6 @@ ...@@ -10,5 +10,6 @@
"obs_group": "bias-temperature-var", "obs_group": "bias-temperature-var",
"detector": "09", "detector": "09",
"pmapname": "", "pmapname": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
csst_dag/dag_config/csst-msc-l1-qc0.json
View file @ 2f7c491e
...@@ -13,5 +13,6 @@ ...@@ -13,5 +13,6 @@
"detector": "09", "detector": "09",
"pmapname": "", "pmapname": "",
"ref_cat": "", "ref_cat": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
csst_dag/dag_config/csst-msc-l1-sls.json
View file @ 2f7c491e
...@@ -13,5 +13,6 @@ ...@@ -13,5 +13,6 @@
"detector": "09", "detector": "09",
"pmapname": "", "pmapname": "",
"ref_cat": "", "ref_cat": "",
"comment": "" "n_file_expected": -1,
"n_file_found": -1
} }
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