Commit 26fb1380 authored by Zhang Xin's avatar Zhang Xin
Browse files

modify extension header value of key DETSIZE; fix the issue black side of sls led flat and skybg

parent 7e65f7cd
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ def generateExtensionHeader(
    h_ext["NAXIS1"] = xlen
    h_ext["NAXIS2"] = ylen
    h_ext["EXTNAME"] = extName
    h_ext["DETSIZE"] = str(xlen) + "x" + str(ylen)
    h_ext["GAIN01"] = chip.gain_channel[0]
    h_ext["GAIN02"] = chip.gain_channel[1]
    h_ext["GAIN03"] = chip.gain_channel[2]
+11 −1
Original line number Diff line number Diff line
@@ -454,11 +454,19 @@ class FlatLED(MockObject):
        led_spec=None,
    ):

        add_deltY = 150
        conf1 = conf[0]
        conf2 = conf[0]
        if np.size(conf) == 2:
            conf2 = conf[1]

        # 色散不是平行于 x 方向,会带来 y 方向偏移;先在 y 方向补出余量:
        # 上方补原图最近的 0:add_deltY 行,下方补原图最近的 ylen-add_deltY:ylen 行,
        # 色散完成后(return 前)再把补出的行裁掉,避免 y 方向出现黑边
        skyMap = np.concatenate(
            [skyMap[:add_deltY], skyMap, skyMap[-add_deltY:]], axis=0
        )

        skyImg = galsim.Image(skyMap, xmin=0, ymin=0)

        tbstart = blueLimit
@@ -651,6 +659,8 @@ class FlatLED(MockObject):

                    print("time: %s ms" % ((T2 - T1) * 1000))
       
        # 裁掉色散前在 y 方向上下各补的 add_deltY 像素
        fImg = galsim.Image(fImg.array[add_deltY:-add_deltY, :])
        if isAlongY == 1:
            fimg, tmx, tmy = SpecDisperser.rotate90(
                array_orig=fImg.array, xc=0, yc=0, isClockwise=0
+13 −0
Original line number Diff line number Diff line
@@ -51,11 +51,21 @@ def calculateSkyMap_split_g(

    # for i in range(len(conf)):
    #     conf[i] = os.path.join(SLSSIM_PATH, conf[i])
    # 因为色散不是平行于x方向,所以需要添加y方向的偏移量,避免y方向有黑边上下各加add_deltY个像素,色散后再减去
    
    add_deltY = 150
    conf1 = conf[0]
    conf2 = conf[0]
    if np.size(conf) == 2:
        conf2 = conf[1]

    # 色散不是平行于 x 方向,会带来 y 方向偏移;先在 y 方向补出余量:
    # 上方补原图最近的 0:add_deltY 行,下方补原图最近的 ylen-add_deltY:ylen 行,
    # 色散完成后(return 前)再把补出的行裁掉,避免 y 方向出现黑边
    skyMap = np.concatenate(
        [skyMap[:add_deltY], skyMap, skyMap[-add_deltY:]], axis=0
    )

    skyImg = galsim.Image(skyMap, xmin=0, ymin=0)

    tbstart = blueLimit
@@ -284,6 +294,9 @@ def calculateSkyMap_split_g(

                print("time: %s ms" % ((T2 - T1) * 1000))

    # 裁掉色散前在 y 方向上下各补的 add_deltY 像素
    fImg = galsim.Image(fImg.array[add_deltY:-add_deltY, :])

    if isAlongY == 1:
        fimg, tmx, tmy = rotate90(array_orig=fImg.array, xc=0, yc=0, isClockwise=0)
    else: