From fc4f347afcc233fa02a1951c38d430649f1231e4 Mon Sep 17 00:00:00 2001 From: rcooke-ast Date: Thu, 19 Oct 2023 10:47:42 +0100 Subject: [PATCH 1/4] minor fixes --- pypeit/spectrographs/vlt_fors.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pypeit/spectrographs/vlt_fors.py b/pypeit/spectrographs/vlt_fors.py index 181af91167..322ef84276 100644 --- a/pypeit/spectrographs/vlt_fors.py +++ b/pypeit/spectrographs/vlt_fors.py @@ -122,18 +122,17 @@ def compound_meta(self, headarr, meta_key): return binning elif meta_key == 'decker': mode = headarr[0]['HIERARCH ESO INS MODE'] - if mode == 'LSS': + if mode in ['LSS', 'MOS']: try: # Science return headarr[0]['HIERARCH ESO INS SLIT NAME'] except KeyError: # Standard! try: return headarr[0]['HIERARCH ESO SEQ SPEC TARG'] except KeyError: - return None - elif mode == 'MOS': - return headarr[0]['HIERARCH ESO INS MOS CHECKSUM'] + return headarr[0]['HIERARCH ESO INS MOS CHECKSUM'] elif mode == 'IMG': # This is for the bias frames + print("IMG!!! - None!") return None else: msgs.error(f"PypeIt does not currently support VLT/FORS2 '{mode}' data reduction.") @@ -287,7 +286,7 @@ def get_detector_par(self, det, hdu=None): numamplifiers = 1, gain = np.atleast_1d(0.70), ronoise = np.atleast_1d(3.15), # High gain - datasec=np.atleast_1d('[11:2059,:]'), + datasec=np.atleast_1d('[12:2059,:]'), oscansec=np.atleast_1d('[2062:,:]'), # Pre-scan has artifacts, so use overscan #datasec=np.atleast_1d('[20:,0:2048]'), #oscansec=np.atleast_1d('[4:20,4:2044]'), From 4454aeb188f9b653594ce9ded2de77f72e98f338 Mon Sep 17 00:00:00 2001 From: rcooke Date: Thu, 19 Oct 2023 19:00:52 +0100 Subject: [PATCH 2/4] rm printout --- pypeit/spectrographs/vlt_fors.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pypeit/spectrographs/vlt_fors.py b/pypeit/spectrographs/vlt_fors.py index 322ef84276..d63ec5211c 100644 --- a/pypeit/spectrographs/vlt_fors.py +++ b/pypeit/spectrographs/vlt_fors.py @@ -132,7 +132,6 @@ def compound_meta(self, headarr, meta_key): return headarr[0]['HIERARCH ESO INS MOS CHECKSUM'] elif mode == 'IMG': # This is for the bias frames - print("IMG!!! - None!") return None else: msgs.error(f"PypeIt does not currently support VLT/FORS2 '{mode}' data reduction.") From 3dbeef76bac91a6df2531dfea5c4ba9c8ce21145 Mon Sep 17 00:00:00 2001 From: rcooke Date: Fri, 20 Oct 2023 14:45:42 +0100 Subject: [PATCH 3/4] fix datasec --- pypeit/spectrographs/vlt_fors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pypeit/spectrographs/vlt_fors.py b/pypeit/spectrographs/vlt_fors.py index d63ec5211c..0e03a0b4e9 100644 --- a/pypeit/spectrographs/vlt_fors.py +++ b/pypeit/spectrographs/vlt_fors.py @@ -285,7 +285,7 @@ def get_detector_par(self, det, hdu=None): numamplifiers = 1, gain = np.atleast_1d(0.70), ronoise = np.atleast_1d(3.15), # High gain - datasec=np.atleast_1d('[12:2059,:]'), + datasec=np.atleast_1d('[11:2059,:]'), oscansec=np.atleast_1d('[2062:,:]'), # Pre-scan has artifacts, so use overscan #datasec=np.atleast_1d('[20:,0:2048]'), #oscansec=np.atleast_1d('[4:20,4:2044]'), From 67709876c5a5d55399806ccf51f29ffd3c6d2a4e Mon Sep 17 00:00:00 2001 From: rcooke Date: Fri, 20 Oct 2023 19:55:05 +0100 Subject: [PATCH 4/4] fix config --- pypeit/spectrographs/vlt_fors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pypeit/spectrographs/vlt_fors.py b/pypeit/spectrographs/vlt_fors.py index 0e03a0b4e9..254245ff44 100644 --- a/pypeit/spectrographs/vlt_fors.py +++ b/pypeit/spectrographs/vlt_fors.py @@ -360,7 +360,7 @@ def config_independent_frames(self): keywords that can be used to assign the frames to a configuration group. """ - return {'bias': 'detector', 'dark': 'detector', 'standard':['detector', 'dispangle', 'dispname']} + return {'bias': 'detector', 'dark': 'detector'} def configuration_keys(self): """