From a1915a1d241a300a826b3b4d9b4f34873f6ff7a9 Mon Sep 17 00:00:00 2001 From: Alfredo Mejia-Narvaez Date: Tue, 6 Feb 2024 09:10:54 -0300 Subject: [PATCH 1/3] fixing wavelength calibration for MJD=60142 --- python/lvmdrp/functions/run_quickdrp.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/lvmdrp/functions/run_quickdrp.py b/python/lvmdrp/functions/run_quickdrp.py index 5cab26cc..8a236f69 100644 --- a/python/lvmdrp/functions/run_quickdrp.py +++ b/python/lvmdrp/functions/run_quickdrp.py @@ -162,8 +162,10 @@ def quick_science_reduction(expnum: int, use_fiducial_master: bool = False, sci_metadata.sort_values("camera", inplace=True) # define arc lamps configuration per spectrograph channel - # arc_lamps = {"b": "hgne", "r": "neon", "z": "neon"} - arc_lamps = {"b": "neon_hgne_argon_xenon", "r": "neon_hgne_argon_xenon", "z": "neon_hgne_argon_xenon"} + if master_mjd == 60142: + arc_lamps = {"b": "hgne", "r": "neon", "z": "neon"} + else: + arc_lamps = {"b": "neon_hgne_argon_xenon", "r": "neon_hgne_argon_xenon", "z": "neon_hgne_argon_xenon"} # run reduction loop for each science camera exposure for sci in sci_metadata.to_dict("records"): From cbb4141a45717c2bf24004386aa188e01da266db Mon Sep 17 00:00:00 2001 From: Alfredo Mejia-Narvaez Date: Wed, 14 Feb 2024 14:50:41 -0300 Subject: [PATCH 2/3] making twilight flats the default --- python/lvmdrp/functions/run_quickdrp.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python/lvmdrp/functions/run_quickdrp.py b/python/lvmdrp/functions/run_quickdrp.py index 8a236f69..43784983 100644 --- a/python/lvmdrp/functions/run_quickdrp.py +++ b/python/lvmdrp/functions/run_quickdrp.py @@ -204,7 +204,9 @@ def quick_science_reduction(expnum: int, use_fiducial_master: bool = False, # macorr_path = os.path.join(masters_path, f"lvm-apercorr-{sci_camera}.fits") mwave_path = os.path.join(masters_path, f"lvm-mwave_{lamps}-{sci_camera}.fits") mlsf_path = os.path.join(masters_path, f"lvm-mlsf_{lamps}-{sci_camera}.fits") - mflat_path = os.path.join(masters_path, f"lvm-mfiberflat-{sci_camera}.fits") + mflat_path = os.path.join(masters_path, f"lvm-mfiberflat_twilight-{sci_camera}.fits") + if not os.path.isfile(mflat_path): + mflat_path = os.path.join(masters_path, f"lvm-mfiberflat-{sci_camera}.fits") else: log.info(f"using master calibration frames from DRP version {drpver}, mjd = {sci_mjd}, camera = {sci_camera}") masters = md.match_master_metadata(target_mjd=sci_mjd, From b52ad67ebe957dff406f41168c82f5fa55cffa8b Mon Sep 17 00:00:00 2001 From: Alfredo Mejia-Narvaez Date: Wed, 14 Feb 2024 15:49:20 -0300 Subject: [PATCH 3/3] fixing file matching for spectrograph stacking --- python/lvmdrp/functions/run_drp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/lvmdrp/functions/run_drp.py b/python/lvmdrp/functions/run_drp.py index c8e08587..fd421b18 100644 --- a/python/lvmdrp/functions/run_drp.py +++ b/python/lvmdrp/functions/run_drp.py @@ -1088,7 +1088,7 @@ def combine_spectrographs(tileid: int, mjd: int, channel: str, expnum: int) -> R """ hsci_paths = sorted(path.expand('lvm_anc', mjd=mjd, tileid=tileid, drpver=drpver, - kind='h', camera=f'{channel}*', imagetype='object', expnum=expnum)) + kind='h', camera=f'{channel}[123]', imagetype='object', expnum=expnum)) if not hsci_paths: log.error(f'no rectified frames found for {expnum = }, {channel = }')