Merge pull request #812 from christinawlindberg/master

added indexing for simulated obsdata being split (i give up)

beast/fitting/fit.py

@@ -902,6 +902,10 @@ def IAU_names_and_extra_info(obsdata, surveyname="PHAT", extraInfo=False):
  obsfiltname = obsdata.filter_aliases[filtername]
  r[filtername] = (obsdata.data[obsfiltname] * obsdata.vega_flux[k]).astype(float)
 
+ # if running a simulation, propagate beast_idx numbers to resort to input obs file
+ if "beast_idx" in list(obsdata.data.keys()):
+ r["beast_idx"] = obsdata.data["beast_idx"]
+
  return r
 
 

beast/tools/split_simulated_catalog.py

@@ -92,6 +92,9 @@ def split_simulated_catalog(
  """
  cat = Table.read(catfile)
 
+ # add index column to help sort merged files later
+ cat["beast_idx"] = np.arange(len(cat))
+
  # write out sub-files, if chosen
  if (n_per_file is not None) or (min_n_subfile is not None):