Commit eaead0e9 authored by BO ZHANG's avatar BO ZHANG 🏀
Browse files

distinguish level0/1 data basis keys

parent 72c9e035
......@@ -68,9 +68,22 @@ PLAN_BASIS_KEYS = (
)
# data basis keys
DATA_BASIS_KEYS = (
LEVEL0_DATA_BASIS_KEYS = (
"instrument",
"dataset",
"obs_type",
"obs_group",
"obs_id",
"detector",
"file_name",
"_id",
"prc_status",
"qc_status",
)
LEVEL1_DATA_BASIS_KEYS = (
"instrument",
"dataset",
"obs_type",
"obs_group",
"obs_id",
......@@ -78,6 +91,9 @@ DATA_BASIS_KEYS = (
"file_name",
"_id",
"prc_status",
"qc_status",
"data_model",
"batch_id",
)
# join_type for data x plan
......@@ -204,7 +220,7 @@ class Dispatcher:
# data basis
data_basis = extract_basis_table(
qr.data,
DATA_BASIS_KEYS,
LEVEL0_DATA_BASIS_KEYS,
)
return data_basis
......@@ -223,7 +239,7 @@ class Dispatcher:
# data basis
data_basis = extract_basis_table(
qr.data,
DATA_BASIS_KEYS,
LEVEL1_DATA_BASIS_KEYS,
)
return data_basis
......@@ -729,6 +745,6 @@ class Dispatcher:
)
data_basis = extract_basis_table(
data_recs.data,
DATA_BASIS_KEYS,
LEVEL0_DATA_BASIS_KEYS,
)
return plan_basis, data_basis
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