From c246801019609cca535ab6153bfd881323eba76e Mon Sep 17 00:00:00 2001 From: BO ZHANG Date: Wed, 19 Oct 2022 12:02:38 +0800 Subject: [PATCH] added support for datatype="all" in CsstMsDataManager --- csst_common/data/csst_params.yml | 32 +++++++++++++++++++++++++++++++- csst_common/data_manager.py | 12 +++++++++--- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/csst_common/data/csst_params.yml b/csst_common/data/csst_params.yml index 9eece6c..25e2696 100644 --- a/csst_common/data/csst_params.yml +++ b/csst_common/data/csst_params.yml @@ -113,4 +113,34 @@ basic: - 28 - 29 - 30 - + detector2filter: + 6: "y" + 7: "i" + 8: "g" + 9: "r" + 11: "z" + 12: "nuv" + 13: "nuv" + 14: "u" + 15: "y" + 16: "y" + 17: "u" + 18: "nuv" + 19: "nuv" + 20: "z" + 22: "r" + 23: "g" + 24: "i" + 25: "y" + 1: "GI" + 2: "GV" + 3: "GU" + 4: "GU" + 5: "GV" + 10: "GI" + 21: "GI" + 26: "GV" + 27: "GU" + 28: "GU" + 29: "GV" + 30: "GI" \ No newline at end of file diff --git a/csst_common/data_manager.py b/csst_common/data_manager.py index 8864254..ce85591 100644 --- a/csst_common/data_manager.py +++ b/csst_common/data_manager.py @@ -56,7 +56,9 @@ class CsstMsDataManager: assert_all_detectors : bool If True, assert data for all detectors are available. datatype : str - The options are {"mbi", "sls"}. + The options are {"mbi", "sls", "all"}. + The "all" option is used for QC in particular. + Note that in this case methods like ``get_bias`` are unavailable. Examples -------- @@ -87,17 +89,21 @@ class CsstMsDataManager: assert ver_sim in CP["sim"]["versions"] self.ver_sim = ver_sim - assert datatype in ["mbi", "sls"] + assert datatype in ["mbi", "sls", "all"] self.datatype = datatype if datatype == "mbi": # MBI self.valid_detectors = CP["mbi"]["detectors"] self.detector2filter = CP["mbi"]["detector2filter"] - else: + elif datatype == "sls": # SLS self.valid_detectors = CP["sls"]["detectors"] self.detector2filter = CP["sls"]["detector2filter"] + else: + # ALL + self.valid_detectors = CP["basic"]["detectors"] + self.detector2filter = CP["basic"]["detector2filter"] self.dir_l0 = dir_l0 self.dir_l1 = dir_l1 -- GitLab