diff --git a/csst/msc/data_manager.py b/csst/msc/data_manager.py index 21251686e3ef2d91eade0e1a66aed77bf5d2faf6..c0880aeb89f874cac4c1ae0009c83b1c22f24cbd 100644 --- a/csst/msc/data_manager.py +++ b/csst/msc/data_manager.py @@ -164,22 +164,29 @@ class CsstMscDataManager: self._exp_start, self._exp_stop, self._exp_id, ccd_id, suffix, ext) return os.path.join(self.dir_l1, fn) - def pc_combined_image(self, suffix="img", ext="fits"): + def pc_combined_file(self, suffix="img", ext="fits"): """ combined images Parameters ---------- suffix: - {"img", "wht", "flg", "cat"} + {"img", "wht", "flg", "cat", "head"} ext: - {"fits", } + {"fits", "head", "ahead" } Returns ------- combined image path """ - fn = "combined_" + "{}.{}".format(suffix, ext) + if self.ver_sim == "C3": + fn = "{}_{}_{}_{}_{}.{}".format( + self._instrument, self._survey, + self._exp_start, self._exp_id, suffix, ext) + elif self.ver_sim == "C5.1": + fn = "{}_{}_{}_SCI_{}_{}_{}_{}.{}".format( + self._telescope, self._instrument, self._survey, + self._exp_start, self._exp_stop, self._exp_id, suffix, ext) return os.path.join(self.dir_l1, fn) @property @@ -187,16 +194,16 @@ class CsstMscDataManager: """ reference catalog """ return os.path.join(self.dir_l1, "ref.cat") + @property + def pc_radecoff(self): + """ plot coordinate diff between obs and ref """ + return os.path.join(self.dir_l1, "radec_off.png") + @property def pc_check_fits(self): """ check fits """ return os.path.join(self.dir_l1, "check.fits") - @property - def pc_combined_head(self): - """ combined head """ - return os.path.join(self.dir_l1, "combined_cat.head") - @property def pc_combined_head_fits(self): """ combined head (converted to) fits """