tweaks

csst_dag/cli/csst_hstdm_l1.py

@@ -105,7 +105,7 @@ for dag in [
     this_n_dag_run_success = len(this_dag_run_list)
     n_dag_run_all += this_n_dag_run_all
     n_dag_run_success += this_n_dag_run_success
-    print(f"- `{dag}` : [{this_n_dag_run_all} / {this_n_dag_run_success}] dag_runs")
+    print(f"- `{dag}` : [ {this_n_dag_run_success} / {this_n_dag_run_all} ] dag_runs")
 
 # print dag_group_run and dag_run_list
 print("\n")

csst_dag/cli/csst_mci_l1.py

@@ -83,6 +83,8 @@ print("\n"*2)
 print(">>> Matching DAGs ...")
 dag_run_list = []
 data_id_list = []
+n_dag_run_all = 0
+n_dag_run_success = 0
 for dag in [
     "csst-cpic-l1",
     "csst-cpic-l1-qc0",
@@ -92,19 +94,25 @@ for dag in [
         plan_basis=plan_basis,
         data_basis=data_basis,
         pmapname=args.pmapname,
-        ref_cat=args.ref_cat,
+        force_success=args.force,
     )
     this_dag_run_list = [this_task["dag_run"] for this_task in this_task_list if this_task["dag_run"] is not None]
-    this_data_id_list = [this_task["relevant_data_id_list"] for this_task in this_task_list if this_task["dag_run"] is not None]
-    print(f"- [{dag}] : {len(this_dag_run_list)} dag_runs")
+    this_data_id_list = [this_task["relevant_data_id_list"] for this_task in this_task_list if
+                         this_task["dag_run"] is not None]
+
     dag_run_list.extend(this_dag_run_list)
     data_id_list.extend(this_data_id_list)
+    this_n_dag_run_all = len(this_task_list)
+    this_n_dag_run_success = len(this_dag_run_list)
+    n_dag_run_all += this_n_dag_run_all
+    n_dag_run_success += this_n_dag_run_success
+    print(f"- `{dag}` : [ {this_n_dag_run_success} / {this_n_dag_run_all} ] dag_runs")
 
-# print dag_group_run and dag_run_list
+    # print dag_group_run and dag_run_list
 print("\n")
-print(">>> dag_group_run:")
+print(">>> `dag_group_run` :")
 print(f"\t- {dag_group_run}")
-print(f">>> dag_run_list[{len(dag_run_list)}]:")
+print(f">>> `dag_run_list` : [ {n_dag_run_success} / {n_dag_run_all} ]")
 if len(dag_run_list) > 0:
     for dag_run in dag_run_list:
         print(f"\t- {dag_run}")

csst_dag/cli/csst_msc_l1.py

@@ -112,10 +112,12 @@ dag_group_run = BaseDAG.gen_dag_group_run(
 )
 
 # generate DAG run list
-print("\n"*2)
+print("\n")
 print(">>> Matching DAGs ...")
 dag_run_list = []
 data_id_list = []
+n_dag_run_all = 0
+n_dag_run_success = 0
 for dag in [
     "csst-msc-l1-mbi",
     "csst-msc-l1-ast",
@@ -127,19 +129,25 @@ for dag in [
         plan_basis=plan_basis,
         data_basis=data_basis,
         pmapname=args.pmapname,
-        ref_cat=args.ref_cat,
+        force_success=args.force,
     )
     this_dag_run_list = [this_task["dag_run"] for this_task in this_task_list if this_task["dag_run"] is not None]
-    this_data_id_list = [this_task["relevant_data_id_list"] for this_task in this_task_list if this_task["dag_run"] is not None]
-    print(f"- [{dag}] : {len(this_dag_run_list)} dag_runs")
+    this_data_id_list = [this_task["relevant_data_id_list"] for this_task in this_task_list if
+                         this_task["dag_run"] is not None]
+
     dag_run_list.extend(this_dag_run_list)
     data_id_list.extend(this_data_id_list)
+    this_n_dag_run_all = len(this_task_list)
+    this_n_dag_run_success = len(this_dag_run_list)
+    n_dag_run_all += this_n_dag_run_all
+    n_dag_run_success += this_n_dag_run_success
+    print(f"- `{dag}` : [ {this_n_dag_run_success} / {this_n_dag_run_all} ] dag_runs")
 
 # print dag_group_run and dag_run_list
 print("\n")
-print(">>> dag_group_run:")
+print(">>> `dag_group_run` :")
 print(f"\t- {dag_group_run}")
-print(f">>> dag_run_list[{len(dag_run_list)}]:")
+print(f">>> `dag_run_list` : [ {n_dag_run_success} / {n_dag_run_all} ]")
 if len(dag_run_list) > 0:
     for dag_run in dag_run_list:
         print(f"\t- {dag_run}")