sort the fibermap table for zbest files

py/desispec/scripts/zcatalog.py

@@ -138,10 +138,14 @@ def read_redrock(rrfile, group=None, recoadd_fibermap=False, minimal=False, pert
             log.info('Recoadding fibermap from %s', os.path.basename(spectra_filename))
             fibermap_orig = read_table(spectra_filename)
             fibermap, expfibermap = coadd_fibermap(fibermap_orig, onetile=pertile)
+            if zbest_file:
+                fibermap.sort(['TARGETID'])
         else:
             fibermap = Table(fx['FIBERMAP'].read())
             expfibermap = fx['EXP_FIBERMAP'].read()
 
+        assert np.all(redshifts['TARGETID'] == fibermap['TARGETID'])
+
         try:
             tsnr2 = fx['TSNR2'].read()
         except IOError:
@@ -150,8 +154,8 @@ def read_redrock(rrfile, group=None, recoadd_fibermap=False, minimal=False, pert
             #
             tsnr2 = None
 
-        assert np.all(redshifts['TARGETID'] == fibermap['TARGETID'])
-        assert np.all(redshifts['TARGETID'] == tsnr2['TARGETID'])
+        if tsnr2 is not None:
+            assert np.all(redshifts['TARGETID'] == tsnr2['TARGETID'])
 
     if minimal:
         # basic set of target information