modify sls psf convolve mode, first convolve psf, then pixel to image; fix Gaus psf bug (398f6272) · Commits · csst-sims / csst_msc_sim

observation_sim/ObservationSim.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ class Observation(object):
		ra_cen = pointing.ra
		dec_cen = pointing.dec

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

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

+95 −55

Original line number	Diff line number	Diff line
		@@ -196,33 +196,26 @@ class MockObject(object):
		# DEBUG
		#########################################################
		# print("before convolveGaussXorders, img_s:", img_s)
		nan_ids = np.isnan(img_s)
		if img_s[nan_ids].shape[0] > 0:
		# img_s[nan_ids] = 0
		print("DEBUG: before convolveGaussXorders specImg nan num is",
		img_s[nan_ids].shape[0])
		# nan_ids = np.isnan(img_s)
		# if img_s[nan_ids].shape[0] > 0:
		# # img_s[nan_ids] = 0
		# print("DEBUG: before convolveGaussXorders specImg nan num is",
		# img_s[nan_ids].shape[0])
		#########################################################
		img_s, orig_off = convolveGaussXorders(img_s, xOrderSigPlus[k])
		# img_s, orig_off = convolveGaussXorders(img_s, xOrderSigPlus[k])
		orig_off = 0
		origin_order_x = v[1] - orig_off
		origin_order_y = v[2] - orig_off

		#########################################################
		# DEBUG
		#########################################################
		# print("DEBUG: orig_off is", orig_off)
		nan_ids = np.isnan(img_s)
		if img_s[nan_ids].shape[0] > 0:
		img_s[nan_ids] = 0
		print("DEBUG: specImg nan num is", img_s[nan_ids].shape[0])
		# nan_ids = np.isnan(img_s)
		# if img_s[nan_ids].shape[0] > 0:
		# img_s[nan_ids] = 0
		# print("DEBUG: specImg nan num is", img_s[nan_ids].shape[0])
		#########################################################
		specImg = galsim.ImageF(img_s)
		photons = galsim.PhotonArray.makeFromImage(specImg)
		photons.x += origin_order_x
		photons.y += origin_order_y

		xlen_imf = int(specImg.xmax - specImg.xmin + 1)
		ylen_imf = int(specImg.ymax - specImg.ymin + 1)
		stamp = galsim.ImageF(xlen_imf, ylen_imf)
		stamp = galsim.ImageF(img_s)
		stamp.wcs = local_wcs
		stamp.setOrigin(origin_order_x, origin_order_y)

		@@ -231,9 +224,7 @@ class MockObject(object):
		if bounds.area() == 0:
		continue
		chip.img.setOrigin(0, 0)
		stamp[bounds] = chip.img[bounds]
		chip.sensor.accumulate(photons, stamp)
		chip.img[bounds] = stamp[bounds]
		chip.img[bounds] = chip.img[bounds]+stamp[bounds]
		chip.img.setOrigin(chip.bound.xmin, chip.bound.ymin)
		del stamp
		del spec_orders
		@@ -430,32 +421,76 @@ class MockObject(object):

		# psf, pos_shear = psf_model.get_PSF(chip=chip, pos_img=pos_img, bandpass=bandpass,
		# folding_threshold=folding_threshold)
		star = galsim.DeltaFunction(gsparams=gsp)
		star = star.withFlux(tel.pupil_area * exptime)
		psf_tmp = galsim.Gaussian(sigma=0.002)
		star = galsim.Convolve(psf_tmp, star)

		starImg = star.drawImage(
		nx=60, ny=60, wcs=chip_wcs_local, offset=offset)
		# star = galsim.DeltaFunction(gsparams=gsp)
		# star = star.withFlux(tel.pupil_area * exptime)

		#psf list :["A","B","C","D","E"]
		starImg_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, star)
		star_p = psf.withFlux(tel.pupil_area * exptime)
		if nnx == 0:
		starImg = star_p.drawImage(wcs=chip_wcs_local, offset=offset)
		nnx = starImg.xmax - starImg.xmin + 1
		nny = starImg.ymax - starImg.ymin + 1
		else:
		starImg = star_p.drawImage(nx = nnx, ny = nny, wcs=chip_wcs_local, offset=offset)
		# n1 = np.sum(np.isinf(starImg.array))
		# n2 = np.sum(np.isnan(starImg.array))
		# if n1>0 or n2 > 0:
		# print("DEBUG: MockObject, inf:%d, nan:%d"%(n1, n2))
		starImg.setOrigin(0, 0)
		starImg_List.append(starImg)
		for order in ["C","D","E"]:
		starImg_List.append(starImg)
		except:
		psf, pos_shear = psf_model.get_PSF(chip=chip, pos_img=pos_img)
		# star_p = galsim.Convolve(psf, star)
		star_p = psf.withFlux(tel.pupil_area * exptime)
		starImg = star_p.drawImage(wcs=chip_wcs_local, offset=offset)
		starImg.setOrigin(0, 0)
		for order in ["A","B","C","D","E"]:
		starImg_List.append(starImg)


		# psf_tmp = galsim.Gaussian(sigma=0.002)
		# star = galsim.Convolve(psf_tmp, star)

		# starImg = star.drawImage(
		# nx=60, ny=60, wcs=chip_wcs_local, offset=offset)

		origin_star = [y_nominal - (starImg.center.y - starImg.ymin),
		x_nominal - (starImg.center.x - starImg.xmin)]
		starImg.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]
		if gal_origin[1] < grating_split_pos_chip < gal_end[1]:
		subSlitPos = int(grating_split_pos_chip - gal_origin[1] + 1)
		# part img disperse
		star_p1s=[]
		for starImg in starImg_List:

		subImg_p1 = starImg.array[:, 0:subSlitPos]
		star_p1 = galsim.Image(subImg_p1)
		origin_p1 = origin_star
		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],
		@@ -463,20 +498,25 @@ class MockObject(object):
		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 starImg in starImg_List:

		subImg_p2 = starImg.array[:,
		subSlitPos + 1:starImg.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],
		@@ -484,38 +524,38 @@ class MockObject(object):
		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=starImg_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=starImg_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
		# del psf
		return 1, pos_shear

observation_sim/mock_objects/SpecDisperser/SpecDisperser.py

+55 −11

File changed.

Preview size limit exceeded, changes collapsed.

observation_sim/mock_objects/SpecDisperser/disperse_c/disperse.pyx

+44 −5

File changed.

Preview size limit exceeded, changes collapsed.