Commit 99f949fd authored by BO ZHANG's avatar BO ZHANG 🏀
Browse files

fixed n_file bug in plan_basis

parent 88313632
...@@ -170,13 +170,14 @@ class Dispatcher: ...@@ -170,13 +170,14 @@ class Dispatcher:
# plan basis / obsid basis # plan basis / obsid basis
try: try:
for _ in qr.data: for _ in qr.data:
if _["instrument"] == "HSTDM": this_instrument = _["instrument"]
if this_instrument == "HSTDM":
if _["params"]["detector"] == "SIS12": if _["params"]["detector"] == "SIS12":
this_n_file = len(_["params"]["exposure_start"]) * 2 this_n_file = len(_["params"]["exposure_start"]) * 2
else: else:
this_n_file = len(_["params"]["exposure_start"]) this_n_file = len(_["params"]["exposure_start"])
else: else:
this_n_file = 1 this_n_file = len(csst[this_instrument].effective_detector_names)
_["n_file"] = this_n_file _["n_file"] = this_n_file
except KeyError: except KeyError:
print(f"`n_epec_frame` is not found in {_}") print(f"`n_epec_frame` is not found in {_}")
...@@ -464,6 +465,8 @@ class Dispatcher: ...@@ -464,6 +465,8 @@ class Dispatcher:
if len(plan_basis) == 0 or len(data_basis) == 0: if len(plan_basis) == 0 or len(data_basis) == 0:
return [] return []
obsid_basis = data_basis.group_by([""])
# unique obsid # unique obsid
u_obsid = table.unique(data_basis["dataset", "obs_id"]) u_obsid = table.unique(data_basis["dataset", "obs_id"])
relevant_plan = table.join( relevant_plan = table.join(
......
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