diff --git a/observation_sim/instruments/chip/effects.py b/observation_sim/instruments/chip/effects.py index 7a6b7a667c15e5ff8bf5d740e63476cd597531d0..21735ede4ef8e5307fc645d75c4592b9e0c0e2d5 100644 --- a/observation_sim/instruments/chip/effects.py +++ b/observation_sim/instruments/chip/effects.py @@ -793,7 +793,7 @@ def ShutterEffectArr(GSImage, t_exp=150, t_shutter=1.3, dist_bearing=735, dt=1E- sizey = ymax-ymin+1 xnewgrid = np.mgrid[xmin:(xmin+sizex)] expeffect = interpolate.splev(xnewgrid, intp, der=0) - expeffect /= np.max(expeffect) + expeffect /= t_exp exparrnormal = np.tile(expeffect, (sizey,1)) # GSImage *= exparrnormal diff --git a/observation_sim/sim_steps/readout_output.py b/observation_sim/sim_steps/readout_output.py index 8ef872fd6d9348f3f46491486010fa41af935c6f..c2cb8a16ab8054a55ad7456fa01987e5d42a8d34 100644 --- a/observation_sim/sim_steps/readout_output.py +++ b/observation_sim/sim_steps/readout_output.py @@ -86,10 +86,10 @@ def quantization_and_output(self, chip, filt, tel, pointing, catalog, obs_param) fname = os.path.join(self.chip_output.subdir, self.h_prim['FILENAME'] + '.fits') - f_name_size = 68 - if (len(self.h_prim['FILENAME']) > f_name_size): - self.updateHeaderInfo(header_flag='prim', keys=['FILENAME'], values=[ - self.h_prim['FILENAME'][0:f_name_size]]) + # f_name_size = 68 + # if (len(self.h_prim['FILENAME']) > f_name_size): + # self.updateHeaderInfo(header_flag='prim', keys=['FILENAME'], values=[ + # self.h_prim['FILENAME'][0:f_name_size]]) hdu1 = fits.PrimaryHDU(header=self.h_prim) diff --git a/tools/get_pointing.py b/tools/get_pointing.py index 073d160b59321ede75351dd8c850f3a1022be287..39216a16c7c2ed7c9cb7481a799c7211288e07aa 100755 --- a/tools/get_pointing.py +++ b/tools/get_pointing.py @@ -63,10 +63,15 @@ class Chip(object): ycen = self.cen_pix_y if pix_scale == None: pix_scale = self.pix_scale - dudx = -np.cos(img_rot.rad) * pix_scale - dudy = -np.sin(img_rot.rad) * pix_scale - dvdx = -np.sin(img_rot.rad) * pix_scale - dvdy = +np.cos(img_rot.rad) * pix_scale + # dudx = -np.cos(img_rot.rad) * pix_scale + # dudy = -np.sin(img_rot.rad) * pix_scale + # dvdx = -np.sin(img_rot.rad) * pix_scale + # dvdy = +np.cos(img_rot.rad) * pix_scale + + dudx = -np.cos(img_rot.rad) * pix_scale + dudy = +np.sin(img_rot.rad) * pix_scale + dvdx = -np.sin(img_rot.rad) * pix_scale + dvdy = -np.cos(img_rot.rad) * pix_scale # dudx = +np.sin(img_rot.rad) * pix_scale # dudy = +np.cos(img_rot.rad) * pix_scale @@ -139,12 +144,11 @@ def getobsPA(ra, dec): angle = math.acos(np.dot(l1l2cross,pdl2cross)/(np.linalg.norm(l1l2cross)*np.linalg.norm(pdl2cross))) angle = (angle)/math.pi*180 - - # if (ra>90 and ra< 270): - # angle=-angle + angle = angle + 90 + if (ra<90 or ra> 270): + angle=-angle return angle - # @jit() def getSelectPointingList(center = [60,-40], radius = 2): points = np.loadtxt('sky.dat') @@ -261,7 +265,7 @@ def findPointingbyChipID(chipID = 8, ra = 60., dec = -40.): if __name__ == "__main__": - tchip, tra, tdec = 8, 60., -40. + tchip, tra, tdec = 13, 60., -40. pointing = findPointingbyChipID(chipID=tchip, ra=tra, dec=tdec) print("[ra_center, dec_center, image_rot]: ", pointing) diff --git a/tools/target_location_check.py b/tools/target_location_check.py index 34293be892b00d330c8fac94037a3502e2b6055e..11f22bac7e8eb8d74606c4e5d003ac92e5e23633 100644 --- a/tools/target_location_check.py +++ b/tools/target_location_check.py @@ -119,10 +119,15 @@ def getTanWCS(ra, dec, img_rot, pix_scale=0.074): """ xcen, ycen = 0, 0 img_rot = img_rot * galsim.degrees + # dudx = -np.cos(img_rot.rad) * pix_scale + # dudy = -np.sin(img_rot.rad) * pix_scale + # dvdx = -np.sin(img_rot.rad) * pix_scale + # dvdy = +np.cos(img_rot.rad) * pix_scale + dudx = -np.cos(img_rot.rad) * pix_scale - dudy = -np.sin(img_rot.rad) * pix_scale + dudy = +np.sin(img_rot.rad) * pix_scale dvdx = -np.sin(img_rot.rad) * pix_scale - dvdy = +np.cos(img_rot.rad) * pix_scale + dvdy = -np.cos(img_rot.rad) * pix_scale moscen = galsim.PositionD(x=xcen, y=ycen) sky_center = galsim.CelestialCoord(