Merge branch 'develop' into bino_maskdef

Author: debora-pe

pypeit/core/skysub.py

@@ -1324,8 +1324,8 @@ def ech_local_skysub_extract(sciimg, sciivar, fullmask, tilts, waveimg,
             if np.sum(ind) == 0:
                 msgs.error('There is a missing order for object {0:d} on slit {1:d}!'.format(iobj, slitid))
             if iobj == 0:
-                order_vec[islit] = sobjs[ind].ECH_ORDER
-            order_snr[islit,iobj] = sobjs[ind].ech_snr
+                order_vec[islit] = sobjs[ind][0].ECH_ORDER
+            order_snr[islit,iobj] = sobjs[ind][0].ech_snr
 
     # Enforce that the number of objects in the sobjs object is an integer multiple of the number of good orders
     if (np.sum(sobjs.sign > 0) % norders) == 0:

pypeit/scripts/run_to_calibstep.py

@@ -89,7 +89,7 @@ def main(args):
             if len(rows) == 0:
                 msgs.error(f"Calibration group {args.calib_group} not found")
             row = rows[0]
-        row = int(row)
+        row = int(row[0])
         calib_id = pypeIt.fitstbl.find_frame_calib_groups(row)[0]
 
         # Calibrations?

pypeit/spectrographs/keck_deimos.py

@@ -1571,7 +1571,7 @@ def spec1d_match_spectra(self, sobjs):
             sobj = sobjs[ibobj]
             mtc = sobj.RA == robjs.RA
             if np.sum(mtc) == 1:
-                irobj = int(ridx[mtc])
+                irobj = int(ridx[mtc][0])
                 if not np.isclose(sobj.DEC, sobjs[irobj].DEC):
                     msgs.error('DEC does not match RA!')
                 bmt.append(ibobj)