Commit b23f926a authored by JX's avatar JX 😵
Browse files

Merge remote-tracking branch 'origin/develop'

parents 5101b309 e1a6d241

tools/get_pointing.py

+13 −9
Original line number Diff line number Diff line
@@ -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

        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

        

        # 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)

tools/target_location_check.py

+7 −2
Original line number Diff line number Diff line
@@ -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(