From 4ad7acd0c7618c77e82d86555e9f96e1dac3eb43 Mon Sep 17 00:00:00 2001 From: Chengliang Date: Tue, 26 Nov 2024 17:40:03 +0800 Subject: [PATCH] update codestyle-PEP8 --- observation_sim/psf/PSFInterp.py | 2 +- observation_sim/psf/_util.py | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/observation_sim/psf/PSFInterp.py b/observation_sim/psf/PSFInterp.py index 7c439bb..25f8c9a 100644 --- a/observation_sim/psf/PSFInterp.py +++ b/observation_sim/psf/PSFInterp.py @@ -360,7 +360,7 @@ class PSFInterp(PSFModel): hoc=self.hoc[twave], hoclist=self.hoclist[twave], PSFCentroidWgt=True) if extrapolate is True: - ccdList = [ 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 22, 23, 24, 25] + ccdList = [6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 22, 23, 24, 25] rr_trim_list = [72, 64, 96, 88, 64, 72, 72, 76, 72, 72, 76, 72, 72, 64, 88, 96, 64, 72] imPSF = psf_extrapolate(imPSF, rr_trim=rr_trim_list[ccdList.index(chip.chipID)], ngg=ngg) diff --git a/observation_sim/psf/_util.py b/observation_sim/psf/_util.py index e57f969..45e1c02 100644 --- a/observation_sim/psf/_util.py +++ b/observation_sim/psf/_util.py @@ -1,6 +1,7 @@ import numpy as np from scipy.interpolate import interp1d + def binningPSF(img, ngg): imgX = img.reshape(ngg, img.shape[0]//ngg, ngg, img.shape[1]//ngg).mean(-1).mean(1) return imgX @@ -31,12 +32,12 @@ def psf_extrapolate(psf, rr_trim=64, ngg=256): # extrapolate PSF if True: xim = np.arange(256)-128 - xim,yim = np.meshgrid(xim, xim) - rim = np.sqrt(xim**2 +yim**2) + xim, yim = np.meshgrid(xim, xim) + rim = np.sqrt(xim**2 + yim**2) # rr_trim = 96 psf_temp = psf - psf_temp[rim > rr_trim] = 0 + psf_temp[rim > rr_trim] = 0 radii, means = radial_average_at_pixel(psf_temp, 128, 128, dr=4) radii_log = np.log(radii[1:]) @@ -47,18 +48,18 @@ def psf_extrapolate(psf, rr_trim=64, ngg=256): # ngg = 1024 xim = np.arange(ngg)-int(ngg/2) - xim,yim = np.meshgrid(xim, xim) - rim = np.sqrt(xim**2 +yim**2) - rim[int(ngg/2),int(ngg/2)] = np.finfo(float).eps # 1e-7 + xim, yim = np.meshgrid(xim, xim) + rim = np.sqrt(xim**2 + yim**2) + rim[int(ngg/2), int(ngg/2)] = np.finfo(float).eps # 1e-7 rim_log = np.log(rim) y_new = f_interp(rim_log) arr = np.zeros([ngg, ngg]) arr[int(ngg/2-128):int(ngg/2+128), int(ngg/2-128):int(ngg/2+128)] = np.log(psf_temp + np.finfo(float).eps) - arr[rim > rr_trim] = 0 - arr[arr==0] = y_new[arr==0] + arr[rim > rr_trim] = 0 + arr[arr == 0] = y_new[arr == 0] psf = np.exp(arr) - psf[rim > int(ngg/2)] = 0 + psf[rim > int(ngg/2)] = 0 imPSF = psf # binningPSF(psf, int(ngg/2)) imPSF = imPSF/np.nansum(imPSF) return imPSF -- GitLab