From a7083ac0044863a628464a799a9988c828901d1a Mon Sep 17 00:00:00 2001 From: BO ZHANG Date: Fri, 17 Mar 2023 13:41:06 +0800 Subject: [PATCH] compatible with C5.2 naming convention --- csst_common/data_manager.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/csst_common/data_manager.py b/csst_common/data_manager.py index f0eecc5..407d78f 100644 --- a/csst_common/data_manager.py +++ b/csst_common/data_manager.py @@ -472,8 +472,12 @@ class CsstMsDataManager: def l0_detector(self, detector=6): """ L0 detector-specific image file path """ assert detector in self.available_detectors - fn = f"{self.telescope}_{self.instrument}_{self.project}_{self.obs_type}_{self.exp_start}_{self.exp_stop}_" \ - f"{self.obs_id}_{detector:02d}_L{self.level}_V{self.version}.{self.ext}" + if self.ver_sim == "C5.2": + fn = f"{self.telescope}_{self.instrument}_{self.project}_{self.obs_type}_{self.exp_start}_" \ + f"{self.exp_stop}_{self.obs_id}_{detector:02d}_L{self.level}_{self.version}.{self.ext}" + else: + fn = f"{self.telescope}_{self.instrument}_{self.project}_{self.obs_type}_{self.exp_start}_" \ + f"{self.exp_stop}_{self.obs_id}_{detector:02d}_L{self.level}_V{self.version}.{self.ext}" fp = os.path.join(self.dir_l0, fn) assert os.path.exists(fp) return os.path.join(self.dir_l0, fn) @@ -481,12 +485,8 @@ class CsstMsDataManager: def l0_crs(self, detector=6): """ L0 cosmic ray file path """ assert detector in self.available_detectors - if self.ver_sim == "C5.2": - fn = f"{self.telescope}_{self.instrument}_{self.project}_CRS_{self.exp_start}_{self.exp_stop}_" \ - f"{self.obs_id}_{detector:02d}_L{self.level}_{self.version}.{self.ext}" - else: - fn = f"{self.telescope}_{self.instrument}_{self.project}_CRS_{self.exp_start}_{self.exp_stop}_" \ - f"{self.obs_id}_{detector:02d}_L{self.level}_V{self.version}.{self.ext}" + fn = f"{self.telescope}_{self.instrument}_{self.project}_CRS_{self.exp_start}_" \ + f"{self.exp_stop}_{self.obs_id}_{detector:02d}_L{self.level}_V{self.version}.{self.ext}" fp = os.path.join(self.dir_l0, fn) assert os.path.exists(fp) return os.path.join(self.dir_l0, fn) -- GitLab