Commit 3499eac2 authored Apr 14, 2024 by Fang Yuedong

* unified the naming of .cat and .log files.

* Changed the name of output folder of pointing to corresponding pointing.obs_id.
* fixed the order .cat hdr updating and the creation of .cat file.
* Changed the naming of shutter and flat reference image: chip IDs now all in 2 digits.
* Updated the __init__ method of ChipOutput
* Removed Config.py from ObservationSim.Config
* Cleaned codes in ObservationSim.py, ChipOutput

parent fcbac14e

Catalog/C6_50sqdeg.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -122,7 +122,7 @@ class Catalog(CatalogBase):

	self.add_fmt = " %10s %8.4f %8.4f %8.4f"		self.add_fmt = " %10s %8.4f %8.4f %8.4f"
	self.add_fmt += " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "		self.add_fmt += " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "
	self.chip_output.update_ouptut_header(additional_column_names=self.add_hdr)		self.chip_output.update_output_header(additional_column_names=self.add_hdr)

	def _get_healpix_list(self):		def _get_healpix_list(self):
	self.sky_coverage = self.chip.getSkyCoverageEnlarged(self.chip.img.wcs, margin=0.2)		self.sky_coverage = self.chip.getSkyCoverageEnlarged(self.chip.img.wcs, margin=0.2)

Catalog/C6_Catalog.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -99,7 +99,7 @@ class Catalog(CatalogBase):

	self.add_fmt = " %10s %8.4f %8.4f %8.4f"		self.add_fmt = " %10s %8.4f %8.4f %8.4f"
	self.add_fmt += " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "		self.add_fmt += " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "
	self.chip_output.update_ouptut_header(additional_column_names=self.add_hdr)		self.chip_output.update_output_header(additional_column_names=self.add_hdr)

	def _get_healpix_list(self):		def _get_healpix_list(self):
	self.sky_coverage = self.chip.getSkyCoverageEnlarged(self.chip.img.wcs, margin=0.2)		self.sky_coverage = self.chip.getSkyCoverageEnlarged(self.chip.img.wcs, margin=0.2)

Catalog/C6_fits_Catalog.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -113,7 +113,7 @@ class Catalog(CatalogBase):

	self.add_fmt = " %10s %8.4f %8.4f %8.4f"		self.add_fmt = " %10s %8.4f %8.4f %8.4f"
	self.add_fmt += " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "		self.add_fmt += " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "
	self.chip_output.update_ouptut_header(additional_column_names=self.add_hdr)		self.chip_output.update_output_header(additional_column_names=self.add_hdr)

	def _get_healpix_list(self):		def _get_healpix_list(self):
	self.sky_coverage = self.chip.getSkyCoverageEnlarged(self.chip.img.wcs, margin=0.2)		self.sky_coverage = self.chip.getSkyCoverageEnlarged(self.chip.img.wcs, margin=0.2)

Catalog/Calib_Catalog.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -106,7 +106,7 @@ class Catalog(CatalogBase):

	self.add_fmt = " %10s %8.4f %8.4f %8.4f"		self.add_fmt = " %10s %8.4f %8.4f %8.4f"
	self.add_fmt += " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "		self.add_fmt += " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "
	self.chip_output.update_ouptut_header(additional_column_names=self.add_hdr)		self.chip_output.update_output_header(additional_column_names=self.add_hdr)

	def _get_healpix_list(self):		def _get_healpix_list(self):
	self.sky_coverage = self.chip.getSkyCoverageEnlarged(self.chip.img.wcs, margin=0.2)		self.sky_coverage = self.chip.getSkyCoverageEnlarged(self.chip.img.wcs, margin=0.2)

Catalog/FGS_Catalog.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -100,7 +100,7 @@ class Catalog(CatalogBase):

	self.add_fmt = " %10s %8.4f %8.4f %8.4f"		self.add_fmt = " %10s %8.4f %8.4f %8.4f"
	self.add_fmt += " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "		self.add_fmt += " %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %8.4f %4d %8.4f "
	self.chip_output.update_ouptut_header(additional_column_names=self.add_hdr)		self.chip_output.update_output_header(additional_column_names=self.add_hdr)

	def _get_healpix_list(self):		def _get_healpix_list(self):
	self.sky_coverage = self.chip.getSkyCoverageEnlarged(self.chip.img.wcs, margin=0.2)		self.sky_coverage = self.chip.getSkyCoverageEnlarged(self.chip.img.wcs, margin=0.2)