Merge branch 'master' into twilights

sdss · Mar 6, 2024 · 1620b4a · 1620b4a
2 parents 8b37b1c + b52ad67
commit 1620b4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/python/lvmdrp/functions/run_drp.py b/python/lvmdrp/functions/run_drp.py
@@ -1094,7 +1094,7 @@ def combine_spectrographs(tileid: int, mjd: int, channel: str, expnum: int, imag
     """
 
     hsci_paths = sorted(path.expand('lvm_anc', mjd=mjd, tileid=tileid, drpver=drpver,
-                               kind='h', camera=f'{channel}*', imagetype=imagetype, expnum=expnum))
+                               kind='h', camera=f'{channel}[123]', imagetype=imagetype, expnum=expnum))
 
     if not hsci_paths:
         log.error(f'no rectified frames found for {expnum = }, {channel = }')

diff --git a/python/lvmdrp/functions/run_quickdrp.py b/python/lvmdrp/functions/run_quickdrp.py
@@ -95,8 +95,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"):