fixed n_file_expected bug for obs_group-detector dispatcher

csst_dag/dag/_dispatcher.py

@@ -543,7 +543,7 @@ class Dispatcher:
             return []
 
         # unique obsgroup basis (using group_by)
-        obsgroup_basis = plan_basis.group_by(
+        obsgroup_plan_basis = plan_basis.group_by(
             keys=[
                 "dataset",
                 "instrument",
@@ -556,29 +556,29 @@ class Dispatcher:
         task_list = []
 
         # loop over obsgroup
-        for i_obsgroup in trange(len(obsgroup_basis.groups), **TQDM_KWARGS):
-            this_obsgroup_basis = obsgroup_basis.groups[i_obsgroup]
-            this_obsgroup_obsid = this_obsgroup_basis["obs_id"].data
-            n_file_expected = this_obsgroup_basis["n_file"].sum()
+        for i_obsgroup_plan in trange(len(obsgroup_plan_basis.groups), **TQDM_KWARGS):
+            this_obsgroup_plan_basis = obsgroup_plan_basis.groups[i_obsgroup_plan]
+            this_obsgroup_obsid = this_obsgroup_plan_basis["obs_id"].data
+            n_file_expected = len(this_obsgroup_obsid)
 
-            this_instrument = this_obsgroup_basis["instrument"][0]
+            this_instrument = this_obsgroup_plan_basis["instrument"][0]
             effective_detector_names = csst[this_instrument].effective_detector_names
 
             for this_effective_detector_name in effective_detector_names:
                 this_task = dict(
-                    dataset=this_obsgroup_basis["dataset"][0],
-                    instrument=this_obsgroup_basis["instrument"][0],
-                    obs_type=this_obsgroup_basis["obs_type"][0],
-                    obs_group=this_obsgroup_basis["obs_group"][0],
+                    dataset=this_obsgroup_plan_basis["dataset"][0],
+                    instrument=this_obsgroup_plan_basis["instrument"][0],
+                    obs_type=this_obsgroup_plan_basis["obs_type"][0],
+                    obs_group=this_obsgroup_plan_basis["obs_group"][0],
                     detector=this_effective_detector_name,
                 )
                 this_obsgroup_detector_expected = table.Table(
                     [
                         dict(
-                            dataset=this_obsgroup_basis["dataset"][0],
-                            instrument=this_obsgroup_basis["instrument"][0],
-                            obs_type=this_obsgroup_basis["obs_type"][0],
-                            obs_group=this_obsgroup_basis["obs_group"][0],
+                            dataset=this_obsgroup_plan_basis["dataset"][0],
+                            instrument=this_obsgroup_plan_basis["instrument"][0],
+                            obs_type=this_obsgroup_plan_basis["obs_type"][0],
+                            obs_group=this_obsgroup_plan_basis["obs_group"][0],
                             obs_id=this_obsid,
                             detector=this_effective_detector_name,
                         )
@@ -610,9 +610,9 @@ class Dispatcher:
                     dict(
                         task=this_task,
                         success=this_success,
-                        relevant_plan=this_obsgroup_basis,
+                        relevant_plan=this_obsgroup_plan_basis,
                         relevant_data=this_obsgroup_detector_found,
-                        n_relevant_plan=len(this_obsgroup_basis),
+                        n_relevant_plan=len(this_obsgroup_plan_basis),
                         n_relevant_data=len(this_obsgroup_detector_found),
                         relevant_data_id_list=(
                             list(this_obsgroup_detector_found["_id"])