From 628bbd16ee6c75c81304d315edd5a587888ced3f Mon Sep 17 00:00:00 2001 From: Ollie Farley Date: Thu, 14 Apr 2022 14:38:12 +0100 Subject: [PATCH 1/2] fix for LGS uplink with ShackHartmann wfs --- soapy/wfs/shackhartmann.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soapy/wfs/shackhartmann.py b/soapy/wfs/shackhartmann.py index 9e3be1af..946db6d7 100644 --- a/soapy/wfs/shackhartmann.py +++ b/soapy/wfs/shackhartmann.py @@ -401,7 +401,7 @@ def applyLgsUplink(self): self.lgs.getLgsPsf(self.los.scrns) - self.lgs_ifft_input_data[:] = self.lgs.psf[::-1, ::-1] + self.lgs_ifft_input_data[:] = self.lgs.psf self.lgs_iFFT() self.ifft_input_data[:] = self.subap_focus_intensity @@ -413,7 +413,7 @@ def applyLgsUplink(self): # back to Focal Plane. self.fft_input_data[:] = self.ifft_output_data self.FFT() - self.subap_focus_intensity[:] = AOFFT.ftShift2d(self.fft_output_data).real + self.subap_focus_intensity[:] = AOFFT.ftShift2d(self.fft_output_data).real[:,::-1,::-1] def calculateSlopes(self): ''' From 547cf1707a44f587f10bec41bc84d2bc47fcd98f Mon Sep 17 00:00:00 2001 From: Ollie Farley Date: Thu, 14 Apr 2022 14:42:29 +0100 Subject: [PATCH 2/2] lgs-uplink example config file to use ShackHartmann --- conf/sh_8x8_lgs-uplink.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/sh_8x8_lgs-uplink.yaml b/conf/sh_8x8_lgs-uplink.yaml index 1edaa015..b2e14518 100644 --- a/conf/sh_8x8_lgs-uplink.yaml +++ b/conf/sh_8x8_lgs-uplink.yaml @@ -43,7 +43,7 @@ WFS: wavelength: 600e-9 1: - type: ShackHartmannLegacy + type: ShackHartmann GSPosition: [0, 0] GSHeight: 90000 GSMag: 8