Commit 2841134c authored by Wei Chengliang's avatar Wei Chengliang
Browse files

restore interpolation in getLEDImage1

parent 22908264
Loading
Loading
Loading
Loading
+17 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ class FlatLED(MockObject):
    # return LED flat, e/s
    ###

    def getLEDImage1(self, led_type="LED1", LED_Img_flag=True, use_regular_grid=True):
    def getLEDImage1(self, led_type="LED1", LED_Img_flag=True, use_regular_grid=False):
        # cwave = cwaves[led_type]
        flat = fits.open(
            os.path.join(self.flatDir, "model_" + cwaves_name[led_type] + "nm.fits")
@@ -257,7 +257,22 @@ class FlatLED(MockObject):
            n_x = np.arange(0, self.chip.npix_x, 1)
            n_y = np.arange(0, self.chip.npix_y, 1)
            M, N = np.meshgrid(n_x, n_y)
            U = interp((N, M)).astype(np.float32)

            x_seg_len = 8
            y_seg_len = 16
            x_seg = int(self.chip.npix_x / x_seg_len)
            y_seg = int(self.chip.npix_y / y_seg_len)
            U = np.zeros([self.chip.npix_y, self.chip.npix_x], dtype=np.float32)
            for y_seg_i in np.arange(y_seg_len):
                y0 = y_seg_i * y_seg
                y1 = (y_seg_i + 1) * y_seg
                for x_seg_i in np.arange(x_seg_len):
                    x0 = x_seg_i * x_seg
                    x1 = (x_seg_i + 1) * x_seg
                    yi = N[y0:y1, x0:x1]
                    xi = M[y0:y1, x0:x1]
                    pts = np.column_stack((yi.ravel(), xi.ravel()))
                    U[y0:y1, x0:x1] = interp(pts).reshape(yi.shape).astype(np.float32)
        else:
            X_ = np.hstack((xx.flatten()[:, None], yy.flatten()[:, None]))
            Z_ = a1.flatten()