From 66c4269fd4f640e6065750feeae5fc8a1ba13da2 Mon Sep 17 00:00:00 2001 From: Robel Geda Date: Mon, 14 Sep 2020 14:02:04 -0400 Subject: [PATCH 1/4] introduce override_detector and override_detector --- webbpsf/wfirst.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/webbpsf/wfirst.py b/webbpsf/wfirst.py index dc400871..44a8fcd0 100644 --- a/webbpsf/wfirst.py +++ b/webbpsf/wfirst.py @@ -477,6 +477,7 @@ def __init__(self): self.pupil_mask_list = self._pupil_controller.pupil_mask_list + self._is_custom_detectors = False self._detector_npixels = 4096 self._detectors = _load_wfi_detector_aberrations(os.path.join(self._datapath, 'wim_zernikes_cycle8.csv')) assert len(self._detectors.keys()) > 0 @@ -556,6 +557,16 @@ def _unmasked_pupil_path(self): def _masked_pupil_path(self): return self._pupil_controller._masked_pupil_path + def override_detector(self, path): + """Override detector aberrations""" + self._detectors = _load_wfi_detector_aberrations(path) + self._is_custom_detectors = True + + def reset_override_detector(self): + """Release detector aberrations override and load default for active filter""" + self._detectors = _load_wfi_detector_aberrations(os.path.join(self._datapath, 'wim_zernikes_cycle8.csv')) + self._is_custom_detectors = False + class CGI(WFIRSTInstrument): """ From fa3bb4a830b0d2f1f89f5c5886720b0b64744f31 Mon Sep 17 00:00:00 2001 From: Robel Geda Date: Mon, 14 Sep 2020 14:15:04 -0400 Subject: [PATCH 2/4] rename override_detector -> override_aberrations --- webbpsf/wfirst.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webbpsf/wfirst.py b/webbpsf/wfirst.py index 44a8fcd0..f9b343d8 100644 --- a/webbpsf/wfirst.py +++ b/webbpsf/wfirst.py @@ -557,12 +557,12 @@ def _unmasked_pupil_path(self): def _masked_pupil_path(self): return self._pupil_controller._masked_pupil_path - def override_detector(self, path): + def override_aberrations(self, path): """Override detector aberrations""" self._detectors = _load_wfi_detector_aberrations(path) self._is_custom_detectors = True - def reset_override_detector(self): + def override_aberrations(self): """Release detector aberrations override and load default for active filter""" self._detectors = _load_wfi_detector_aberrations(os.path.join(self._datapath, 'wim_zernikes_cycle8.csv')) self._is_custom_detectors = False From fbc1e747499f243adc9af82e01698b605f0de338 Mon Sep 17 00:00:00 2001 From: Robel Geda Date: Mon, 14 Sep 2020 14:18:19 -0400 Subject: [PATCH 3/4] rename class attr override_detector -> override_aberrations --- webbpsf/wfirst.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webbpsf/wfirst.py b/webbpsf/wfirst.py index f9b343d8..3f4dd416 100644 --- a/webbpsf/wfirst.py +++ b/webbpsf/wfirst.py @@ -477,7 +477,7 @@ def __init__(self): self.pupil_mask_list = self._pupil_controller.pupil_mask_list - self._is_custom_detectors = False + self._is_custom_aberrations = False self._detector_npixels = 4096 self._detectors = _load_wfi_detector_aberrations(os.path.join(self._datapath, 'wim_zernikes_cycle8.csv')) assert len(self._detectors.keys()) > 0 @@ -560,12 +560,12 @@ def _masked_pupil_path(self): def override_aberrations(self, path): """Override detector aberrations""" self._detectors = _load_wfi_detector_aberrations(path) - self._is_custom_detectors = True + self._is_custom_aberrations = True - def override_aberrations(self): + def reset_override_aberrations(self): """Release detector aberrations override and load default for active filter""" self._detectors = _load_wfi_detector_aberrations(os.path.join(self._datapath, 'wim_zernikes_cycle8.csv')) - self._is_custom_detectors = False + self._is_custom_aberrations = False class CGI(WFIRSTInstrument): From a6cd98733751cd50cbc57ece797f142973c6e7af Mon Sep 17 00:00:00 2001 From: Robel Geda Date: Mon, 14 Sep 2020 14:20:15 -0400 Subject: [PATCH 4/4] edit docsstring for WFI.reset_override_aberrations --- webbpsf/wfirst.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webbpsf/wfirst.py b/webbpsf/wfirst.py index 3f4dd416..b9c84ecd 100644 --- a/webbpsf/wfirst.py +++ b/webbpsf/wfirst.py @@ -563,7 +563,7 @@ def override_aberrations(self, path): self._is_custom_aberrations = True def reset_override_aberrations(self): - """Release detector aberrations override and load default for active filter""" + """Release detector aberrations override and loads default""" self._detectors = _load_wfi_detector_aberrations(os.path.join(self._datapath, 'wim_zernikes_cycle8.csv')) self._is_custom_aberrations = False