Merge branch 'main' into 2025_04_28

Author: andrew-saydjari

pipeline.jl

@@ -244,15 +244,15 @@ flush(stdout);
             "_")
         # probably change to FITS to make astronomers happy (this JLD2, which is HDF5, is just for debugging)
 
-        metadata = Dict([
+        metadata = Dict(
             "cartid" => cartid,
             "nread_used" => nread_used,
             "nread_total" => nread_total,
             "mjd_mid_exposure_old" => value(mjd_mid_exposure_old),
             "mjd_mid_exposure_rough" => value(mjd_mid_exposure_rough),
             "mjd_mid_exposure_precise" => value(mjd_mid_exposure_precise),
             "mjd_mid_exposure" => value(mjd_mid_exposure)
-        ])
+        )
         fname = joinpath(outdir, "apred/$(mjd)/" * outfname * ".h5")
         safe_jldsave(fname, metadata; dimage, ivarimage, chisqimage, CRimage, saturation_image)
         return fname
@@ -273,7 +273,7 @@ flush(stdout);
         nread_used = metadata["nread_used"]
 
         ### dark current subtraction
-        darkRateflst = sort(glob("darkRate_$(tele)_$(chip)_*", dirname(fname)))
+        darkRateflst = sort(glob("darkRate_$(tele)_$(chip)_*.h5", dirname(fname)))
         if length(darkRateflst) != 1
             error("I didn't just find one darkRate file for mjd $mjd, I found $(length(darkRateflst))")
         end
@@ -284,7 +284,7 @@ flush(stdout);
         # should I be modifying ivarimage? (uncertainty on dark rate in quad... but dark subtraction has bigger sys)
 
         ### flat fielding
-        flatFractionflst = sort(glob("flatFraction_$(tele)_$(chip)_*", dirname(fname)))
+        flatFractionflst = sort(glob("flatFraction_$(tele)_$(chip)_*.h5", dirname(fname)))
         if length(flatFractionflst) != 1
             error("I didn't just find one flatFraction file for mjd $mjd, I found $(length(flatFractionflst))")
         end

pipeline_2d_1d.jl

@@ -337,7 +337,7 @@ flush(stdout);
 println("Solving skyline wavelength solution:");
 flush(stdout);
 all1DObjectSkyPeaks = replace.(
-    replace.(all1DObject, "ar1Dcal" => "skyLinePeaks"), "ar1D" => "skyLinePeaks")
+replace.(all1DObject, "ar1Dcal" => "skyLinePeaks"), "ar1D" => "skyLinePeaks")
 @showprogress pmap(get_and_save_sky_wavecal, all1DObjectSkyPeaks)
 
 ## TODO when are we going to split into individual fiber files? Then we should be writing fiber type to the file name