Merge remote-tracking branch 'origin/develop' (45156a94) · Commits · csst-sims / csst_msc_sim

observation_sim/ObservationSim.py

+29 −6

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ class Observation(object):
		self.filter_param = FilterParam()
		self.Catalog = Catalog

		def prepare_chip_for_exposure(self, chip, ra_cen, dec_cen, pointing, wcs_fp=None):
		def prepare_chip_for_exposure(self, chip, ra_cen, dec_cen, pointing, wcs_fp=None, slsPSFOptim=False):
		# Get WCS for the focal plane
		if wcs_fp == None:
		wcs_fp = self.focal_plane.getTanWCS(
		@@ -34,6 +34,27 @@ class Observation(object):
		chip.img.setOrigin(chip.bound.xmin, chip.bound.ymin)
		chip.img.wcs = wcs_fp

		chip.slsPSFOptim = slsPSFOptim
		if chip.chipID in [1, 2, 3, 4, 5, 10, 21, 26, 27, 28, 29, 30] and slsPSFOptim:
		chip.img_stack = {}
		for id1 in np.arange(2):
		gn = chip_utils.getChipSLSGratingID(chip.chipID)[id1]
		orders = {}
		# for id2 in ['-2','-1','0','1','2']:
		for id2 in ['0', '1']:
		o_n = "order"+id2
		allbands = {}
		for id3 in ['1', '2', '3', '4']:
		w_n = "w"+id3
		allbands[w_n] = galsim.ImageF(chip.npix_x, chip.npix_y)
		allbands[w_n].setOrigin(
		chip.bound.xmin, chip.bound.ymin)
		allbands[w_n].wcs = wcs_fp
		orders[o_n] = allbands
		chip.img_stack[gn] = orders
		else:
		chip.img_stack = {}

		# Get random generators for this chip
		chip.rng_poisson, chip.poisson_noise = chip_utils.get_poisson(
		seed=int(self.config["random_seeds"]["seed_poisson"]) + pointing.id*30 + chip.chipID, sky_level=0.)
		@@ -91,15 +112,17 @@ class Observation(object):
		input_date_str=date_str,
		input_time_str=time_str
		)
		ra_cen, dec_cen = ra_cen[0], dec_cen[0]
		ra_offset, dec_offset = pointing.ra - ra_cen, pointing.dec - dec_cen
		ra_offset, dec_offset = pointing.ra - \
		ra_cen[0], pointing.dec - dec_cen[0]
		else:
		ra_offset, dec_offset = 0., 0.
		ra_cen = pointing.ra
		dec_cen = pointing.dec
		ra_offset, dec_offset = 0., 0.

		slsPSFOpt = False
		# Prepare necessary chip properties for simulation
		chip = self.prepare_chip_for_exposure(chip, ra_cen, dec_cen, pointing)
		chip = self.prepare_chip_for_exposure(
		chip, ra_cen, dec_cen, pointing, slsPSFOptim=slsPSFOpt)

		# Initialize SimSteps
		sim_steps = SimSteps(overall_config=self.config,

observation_sim/config/ChipOutput.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -78,12 +78,12 @@ class ChipOutput(object):
		self.hdr += "\n"
		self.cat.write(self.hdr)

		def cat_add_obj(self, obj, pos_img, pos_shear):
		def cat_add_obj(self, obj, pos_img, pos_shear, ra_offset=0., dec_offset=0.):
		ximg = obj.real_pos.x + 1.0
		yimg = obj.real_pos.y + 1.0

		line = self.fmt % (
		obj.id, int(self.chip_label), self.filt.filter_type, ximg, yimg, obj.ra, obj.dec, obj.ra_orig, obj.dec_orig, obj.z, obj.getMagFilter(
		obj.id, int(self.chip_label), self.filt.filter_type, ximg, yimg, obj.ra + ra_offset, obj.dec + dec_offset, obj.ra_orig, obj.dec_orig, obj.z, obj.getMagFilter(
		self.filt), obj.type,
		obj.pmra, obj.pmdec, obj.rv, obj.parallax)
		line += obj.additional_output_str

observation_sim/mock_objects/Galaxy.py

+88 −39

Original line number	Diff line number	Diff line
		@@ -323,28 +323,73 @@ class Galaxy(MockObject):
		# # if fd_shear is not None:
		# # gal = gal.shear(fd_shear)

		starImg = gal.drawImage(
		wcs=chip_wcs_local, offset=offset, method='real_space')
		galImg_List = []
		try:
		pos_img_local = [0,0]
		x_start = chip.x_cen/chip.pix_size - chip.npix_x / 2.
		y_start = chip.y_cen/chip.pix_size - chip.npix_y / 2.
		pos_img_local[0] = pos_img.x - x_start
		pos_img_local[1] = pos_img.y - y_start
		nnx = 0
		nny = 0
		for order in ["A","B"]:
		psf, pos_shear = psf_model.get_PSF(
		chip, pos_img_local=pos_img_local, bandNo=i+1, galsimGSObject=True, g_order=order, grating_split_pos=grating_split_pos)
		star_p = galsim.Convolve(psf, gal)
		if nnx == 0:
		galImg = star_p.drawImage(wcs=chip_wcs_local, offset=offset)
		nnx = galImg.xmax - galImg.xmin + 1
		nny = galImg.ymax - galImg.ymin + 1
		else:
		galImg = star_p.drawImage(nx = nnx, ny = nny, wcs=chip_wcs_local, offset=offset)
		galImg.setOrigin(0, 0)
		# n1 = np.sum(np.isinf(galImg.array))
		# n2 = np.sum(np.isnan(galImg.array))
		# if n1>0 or n2 > 0:
		# print("DEBUG: Galaxy, inf:%d, nan:%d"%(n1, n2))
		if np.sum(np.isnan(galImg.array)) > 0:
		# ERROR happens
		return 2, pos_shear
		galImg_List.append(galImg)
		for order in ["C","D","E"]:
		galImg_List.append(galImg)
		except:
		psf, pos_shear = psf_model.get_PSF(chip=chip, pos_img=pos_img)
		star_p = galsim.Convolve(psf, gal)
		galImg = star_p.drawImage(wcs=chip_wcs_local, offset=offset)
		galImg.setOrigin(0, 0)
		if np.sum(np.isnan(galImg.array)) > 0:
		# ERROR happens
		return 2, pos_shear
		for order in ["A","B","C","D","E"]:
		galImg_List.append(galImg)

		# starImg = gal.drawImage(
		# wcs=chip_wcs_local, offset=offset, method='real_space')

		origin_star = [y_nominal - (starImg.center.y - starImg.ymin),
		x_nominal - (starImg.center.x - starImg.xmin)]
		starImg.setOrigin(0, 0)
		origin_star = [y_nominal - (galImg.center.y - galImg.ymin),
		x_nominal - (galImg.center.x - galImg.xmin)]
		galImg.setOrigin(0, 0)
		gal_origin = [origin_star[0], origin_star[1]]
		gal_end = [origin_star[0] + starImg.array.shape[0] -
		1, origin_star[1] + starImg.array.shape[1] - 1]
		gal_end = [origin_star[0] + galImg.array.shape[0] -
		1, origin_star[1] + galImg.array.shape[1] - 1]

		if gal_origin[1] < grating_split_pos_chip < gal_end[1]:
		subSlitPos = int(grating_split_pos_chip - gal_origin[1] + 1)
		# part img disperse

		subImg_p1 = starImg.array[:, 0:subSlitPos]
		star_p1s=[]
		for galImg in galImg_List:

		subImg_p1 = galImg.array[:, 0:subSlitPos]
		star_p1 = galsim.Image(subImg_p1)
		star_p1.setOrigin(0, 0)
		star_p1s.append(star_p1)
		origin_p1 = origin_star
		xcenter_p1 = min(x_nominal, grating_split_pos_chip-1) - 0
		ycenter_p1 = y_nominal-0

		sdp_p1 = SpecDisperser(orig_img=star_p1, xcenter=xcenter_p1,
		sdp_p1 = SpecDisperser(orig_img=star_p1s, xcenter=xcenter_p1,
		ycenter=ycenter_p1, origin=origin_p1,
		tar_spec=normalSED,
		band_start=brange[0], band_end=brange[1],
		@@ -352,21 +397,25 @@ class Galaxy(MockObject):
		isAlongY=0,
		flat_cube=flat_cube)

		# self.addSLStoChipImage(sdp=sdp_p1, chip=chip, xOrderSigPlus = xOrderSigPlus, local_wcs=chip_wcs_local)
		pos_shear = self.addSLStoChipImageWithPSF(sdp=sdp_p1, chip=chip, pos_img_local=[xcenter_p1, ycenter_p1],
		psf_model=psf_model, bandNo=i + 1,
		grating_split_pos=grating_split_pos,
		local_wcs=chip_wcs_local, pos_img=pos_img)
		self.addSLStoChipImage(sdp=sdp_p1, chip=chip, xOrderSigPlus = xOrderSigPlus, local_wcs=chip_wcs_local)
		# pos_shear = self.addSLStoChipImageWithPSF(sdp=sdp_p1, chip=chip, pos_img_local=[xcenter_p1, ycenter_p1],
		# psf_model=psf_model, bandNo=i + 1,
		# grating_split_pos=grating_split_pos,
		# local_wcs=chip_wcs_local, pos_img=pos_img)

		star_p2s=[]
		for galImg in galImg_List:

		subImg_p2 = starImg.array[:,
		subSlitPos+1:starImg.array.shape[1]]
		subImg_p2 = galImg.array[:,
		subSlitPos + 1:galImg.array.shape[1]]
		star_p2 = galsim.Image(subImg_p2)
		star_p2.setOrigin(0, 0)
		star_p2s.append(star_p2)
		origin_p2 = [origin_star[0], grating_split_pos_chip]
		xcenter_p2 = max(x_nominal, grating_split_pos_chip - 1) - 0
		ycenter_p2 = y_nominal - 0

		sdp_p2 = SpecDisperser(orig_img=star_p2, xcenter=xcenter_p2,
		sdp_p2 = SpecDisperser(orig_img=star_p2s, xcenter=xcenter_p2,
		ycenter=ycenter_p2, origin=origin_p2,
		tar_spec=normalSED,
		band_start=brange[0], band_end=brange[1],
		@@ -374,41 +423,41 @@ class Galaxy(MockObject):
		isAlongY=0,
		flat_cube=flat_cube)

		# self.addSLStoChipImage(sdp=sdp_p2, chip=chip, xOrderSigPlus = xOrderSigPlus, local_wcs=chip_wcs_local)
		pos_shear = self.addSLStoChipImageWithPSF(sdp=sdp_p2, chip=chip, pos_img_local=[xcenter_p2, ycenter_p2],
		psf_model=psf_model, bandNo=i + 1,
		grating_split_pos=grating_split_pos,
		local_wcs=chip_wcs_local, pos_img=pos_img)
		self.addSLStoChipImage(sdp=sdp_p2, chip=chip, xOrderSigPlus = xOrderSigPlus, local_wcs=chip_wcs_local)
		# pos_shear = self.addSLStoChipImageWithPSF(sdp=sdp_p2, chip=chip, pos_img_local=[xcenter_p2, ycenter_p2],
		# psf_model=psf_model, bandNo=i + 1,
		# grating_split_pos=grating_split_pos,
		# local_wcs=chip_wcs_local, pos_img=pos_img)

		del sdp_p1
		del sdp_p2
		elif grating_split_pos_chip <= gal_origin[1]:
		sdp = SpecDisperser(orig_img=starImg, xcenter=x_nominal - 0,
		sdp = SpecDisperser(orig_img=galImg_List, xcenter=x_nominal - 0,
		ycenter=y_nominal - 0, origin=origin_star,
		tar_spec=normalSED,
		band_start=brange[0], band_end=brange[1],
		conf=chip.sls_conf[1],
		isAlongY=0,
		flat_cube=flat_cube)
		# self.addSLStoChipImage(sdp=sdp, chip=chip, xOrderSigPlus = xOrderSigPlus, local_wcs=chip_wcs_local)
		pos_shear = self.addSLStoChipImageWithPSF(sdp=sdp, chip=chip, pos_img_local=[x_nominal, y_nominal],
		psf_model=psf_model, bandNo=i + 1,
		grating_split_pos=grating_split_pos,
		local_wcs=chip_wcs_local, pos_img=pos_img)
		self.addSLStoChipImage(sdp=sdp, chip=chip, xOrderSigPlus = xOrderSigPlus, local_wcs=chip_wcs_local)
		# pos_shear = self.addSLStoChipImageWithPSF(sdp=sdp, chip=chip, pos_img_local=[x_nominal, y_nominal],
		# psf_model=psf_model, bandNo=i + 1,
		# grating_split_pos=grating_split_pos,
		# local_wcs=chip_wcs_local, pos_img=pos_img)
		del sdp
		elif grating_split_pos_chip >= gal_end[1]:
		sdp = SpecDisperser(orig_img=starImg, xcenter=x_nominal - 0,
		sdp = SpecDisperser(orig_img=galImg_List, xcenter=x_nominal - 0,
		ycenter=y_nominal - 0, origin=origin_star,
		tar_spec=normalSED,
		band_start=brange[0], band_end=brange[1],
		conf=chip.sls_conf[0],
		isAlongY=0,
		flat_cube=flat_cube)
		# self.addSLStoChipImage(sdp=sdp, chip=chip, xOrderSigPlus = xOrderSigPlus, local_wcs=chip_wcs_local)
		pos_shear = self.addSLStoChipImageWithPSF(sdp=sdp, chip=chip, pos_img_local=[x_nominal, y_nominal],
		psf_model=psf_model, bandNo=i + 1,
		grating_split_pos=grating_split_pos,
		local_wcs=chip_wcs_local, pos_img=pos_img)
		self.addSLStoChipImage(sdp=sdp, chip=chip, xOrderSigPlus = xOrderSigPlus, local_wcs=chip_wcs_local)
		# pos_shear = self.addSLStoChipImageWithPSF(sdp=sdp, chip=chip, pos_img_local=[x_nominal, y_nominal],
		# psf_model=psf_model, bandNo=i + 1,
		# grating_split_pos=grating_split_pos,
		# local_wcs=chip_wcs_local, pos_img=pos_img)
		del sdp

		# print(self.y_nominal, starImg.center.y, starImg.ymin)

observation_sim/mock_objects/MockObject.py

+223 −112

File changed.

Preview size limit exceeded, changes collapsed.

observation_sim/mock_objects/SpecDisperser/SpecDisperser.py

+55 −11

Original line number	Diff line number	Diff line
		@@ -65,10 +65,30 @@ class SpecDisperser(object):
		# self.img_x = orig_img.shape[1]
		# self.img_y = orig_img.shape[0]

		self.thumb_img = np.abs(orig_img.array)
		self.thumb_x = orig_img.center.x
		self.thumb_y = orig_img.center.y
		self.img_sh = orig_img.array.shape
		# 5 orders, A, B ,
		orderName=["A","B","C","D","E"]
		self.orig_img_orders = OrderedDict()
		if isinstance(orig_img, list):
		orig_img_list = orig_img
		list_len = len(orig_img_list)
		if list_len < 5:
		for i in np.arange(5-list_len):
		orig_img_list.append(orig_img_list[list_len-1])
		for i, k in enumerate(orig_img_list):
		self.orig_img_orders[orderName[i]] = k


		if isinstance(orig_img, galsim.Image):
		for i in np.arange(5):
		self.orig_img_orders[orderName[i]] = orig_img


		orig_img_one = self.orig_img_orders["A"]

		self.thumb_img = np.abs(orig_img_one.array)
		self.thumb_x = orig_img_one.center.x
		self.thumb_y = orig_img_one.center.y
		self.img_sh = orig_img_one.array.shape

		self.id = gid

		@@ -78,10 +98,13 @@ class SpecDisperser(object):
		self.isAlongY = isAlongY
		self.flat_cube = flat_cube
		if self.isAlongY == 1:
		self.thumb_img, self.thumb_x, self.thumb_y = rotate90(array_orig=self.thumb_img, xc=orig_img.center.x,
		yc=orig_img.center.y, isClockwise=1)
		for order in orderName:
		self.orig_img_orders[order], self.thumb_x, self.thumb_y = rotate90(array_orig=self.orig_img_orders[order], xc=orig_img_one.center.x,
		yc=orig_img_one.center.y, isClockwise=1)
		# self.thumb_img, self.thumb_x, self.thumb_y = rotate90(array_orig=self.thumb_img, xc=orig_img_one.center.x,
		# yc=orig_img_one.center.y, isClockwise=1)

		self.img_sh = orig_img.array.T.shape
		self.img_sh = self.orig_img_orders[order].array.T.shape
		self.xcenter = ycenter
		self.ycenter = xcenter

		@@ -111,10 +134,16 @@ class SpecDisperser(object):

		def compute_spec(self, beam):

		# if beam == "B":
		# return self.thumb_img, self.origin[1], self.origin[0], None, None, None

		from .disperse_c import interp
		from .disperse_c import disperse
		# from MockObject.disperse_c import disperse

		self.thumb_img = np.abs(self.orig_img_orders[beam].array)
		self.thumb_x = self.orig_img_orders[beam].center.x
		self.thumb_y = self.orig_img_orders[beam].center.y
		self.img_sh = self.orig_img_orders[beam].array.shape
		dx = self.grating_conf.dxlam[beam]
		xoff = 0
		ytrace_beam, lam_beam = self.grating_conf.get_beam_trace(x=self.xcenter, y=self.ycenter, dx=(dx + xoff),
		@@ -169,7 +198,8 @@ class SpecDisperser(object):

		dyc = cast[int](np.floor(ytrace_beam+0.5))

		dypix = cast[int](np.floor(ytrace_beam - dyc[0] + x0[0] + 0.5))
		# dypix = cast[int](np.floor(ytrace_beam - dyc[0] + x0[0] + 0.5))
		dypix = dyc - dyc[0] + x0[0]

		frac_ids = yfrac_beam < 0

		@@ -248,7 +278,8 @@ class SpecDisperser(object):
		# beam_flat[k] = self.flat_cube[:, originOut_y + i, originOut_x + j]

		status = disperse.disperse_grism_object(self.thumb_img.astype(np.float32),
		flat_index[nonz], yfrac_beam[nonz],
		flat_index[nonz],
		yfrac_beam[nonz],
		sensitivity_beam[nonz],
		modelf, x0,
		array(self.img_sh,
		@@ -258,11 +289,24 @@ class SpecDisperser(object):
		lam_beam[lam_index][nonz])

		model = modelf.reshape(beam_sh)
		# n1 = np.sum(np.isinf(model))
		# n2 = np.sum(np.isnan(model))
		# n3 = np.sum(np.isinf(modelf))
		# n4 = np.sum(np.isnan(modelf))
		# if n1>0 or n2 > 0:
		# print("DEBUG: SpecDisperser, inf:%d, nan:%d--------%d,%d"%(n1, n2, n3, n4))
		# print(dypix)
		# n1 = np.sum(np.isinf(self.thumb_img.astype(np.float32)))
		# n2 = np.sum(np.isnan(self.thumb_img.astype(np.float32)))
		# n3 = np.sum(np.isinf(yfrac_beam))
		# n4 = np.sum(np.isnan(yfrac_beam))
		# n5 = np.sum(np.isinf(sensitivity_beam))
		# n6 = np.sum(np.isnan(sensitivity_beam))
		# print("DEBUG: SpecDisperser, innput ---inf:%d, nan:%d, yfrac_beam:%d/%d, sensitivity_beam:%d/%d"%(n1, n2, n3, n4, n5, n6))
		self.beam_flux[beam] = sum(modelf)

		if self.isAlongY == 1:
		model, _, _ = rotate90(array_orig=model, isClockwise=0)

		return model, originOut_x, originOut_y, dxpix, dypix, lam_beam, ysens

		def writerSensitivityFile(self, conffile='', beam='', w=None, sens=None):