improve coverage, fix bugs

Author: bhazelton

pyuvsim/simsetup.py

@@ -776,7 +776,8 @@ def get_skymodel(self, inds=None):
             other['name'] = self.name
 
         empty_sky = pyradiosky.SkyModel()
-        if hasattr(empty_sky, "filname"):
+        if hasattr(empty_sky, "filename"):  # pragma: nocover
+            # this only works for very new versions of pyradiosky
             other["filename"] = self.filename
 
         return pyradiosky.SkyModel(

pyuvsim/tests/test_run.py

@@ -76,6 +76,10 @@ def test_run_paramfile_uvsim(goto_tempdir, paramfile):
     assert uvutils._check_history_version(uv_new.history, pyradiosky.__version__)
     assert uvutils._check_history_version(uv_new.history, pyuvdata.__version__)
     assert uvutils._check_history_version(uv_new.history, pyuvsim.__version__)
+    assert uvutils._check_history_version(uv_new.history, paramfile)
+    assert uvutils._check_history_version(uv_new.history, 'triangle_bl_layout.csv')
+    assert uvutils._check_history_version(uv_new.history, '28m_triangle_10time_10chan.yaml')
+    assert uvutils._check_history_version(uv_new.history, "Npus =")
 
     # Reset parts that will deviate
     uv_new.history = uv_ref.history
@@ -288,6 +292,16 @@ def test_sim_on_moon(future_shapes):
     param_dict = pyuvsim.simsetup._config_str_to_dict(param_filename)
     param_dict['select'] = {'redundant_threshold': 0.1}
     uv_obj, beam_list, beam_dict = pyuvsim.initialize_uvdata_from_params(param_dict)
+
+    # set the filename to make sure it ends up in the history,
+    # remove the parameter file info from extra_keywords
+    uv_obj.filename = ["moon_sim"]
+    uv_obj._filename.form = (1,)
+    uv_obj.extra_keywords.pop('obsparam')
+    uv_obj.extra_keywords.pop('telecfg')
+    uv_obj.extra_keywords.pop('layout')
+    uv_obj.check()
+
     uv_obj.select(times=uv_obj.time_array[0])
     tranquility_base = MoonLocation.from_selenocentric(*uv_obj.telescope_location, 'meter')
 
@@ -301,5 +315,11 @@ def test_sim_on_moon(future_shapes):
     uv_out = pyuvsim.uvsim.run_uvdata_uvsim(
         uv_obj, beam_list, beam_dict, catalog=sources, quiet=True
     )
+    assert uvutils._check_history_version(uv_out.history, pyradiosky.__version__)
+    assert uvutils._check_history_version(uv_out.history, pyuvdata.__version__)
+    assert uvutils._check_history_version(uv_out.history, pyuvsim.__version__)
+    assert uvutils._check_history_version(uv_out.history, uv_obj.filename[0])
+    assert uvutils._check_history_version(uv_out.history, "Npus =")
+
     assert np.allclose(uv_out.data_array[:, :, 0], 0.5)
     assert uv_out.extra_keywords['world'] == 'moon'

pyuvsim/tests/test_simsetup.py

@@ -1435,13 +1435,19 @@ def test_skymodeldata(component_type, cat_with_some_pols):
     # Test that SkyModelData class can properly recreate a SkyModel and subselect.
     if component_type == 'point':
         sky = cat_with_some_pols
+        filename_use = "mock_with_pol"
     else:
         pytest.importorskip('astropy_healpix')
         path = os.path.join(SKY_DATA_PATH, 'healpix_disk.skyh5')
         sky = pyradiosky.SkyModel()
         sky.read_skyh5(path)
+        filename_use = ["healpix_disk"]
 
-    smd = pyuvsim.simsetup.SkyModelData(sky)
+    smd = pyuvsim.simsetup.SkyModelData(sky, filename=filename_use)
+    if isinstance(filename_use, str):
+        assert smd.filename == [filename_use]
+    else:
+        assert smd.filename == filename_use
 
     if hasattr(sky, "get_lon_lat"):
         sky_ra, sky_dec = sky.get_lon_lat()

pyuvsim/uvsim.py

@@ -779,14 +779,13 @@ def run_uvdata_uvsim(input_uv, beam_list, beam_dict=None, catalog=None, quiet=Fa
         history = simutils.get_version_string()
         if catalog.filename is not None:
             history += ' Sources from source list(s): [' + ', '.join(catalog.filename) + '].'
-        if 'obs_param_file' in input_uv.extra_keywords:
-            obs_param_file = input_uv.extra_keywords['obs_param_file']
-            telescope_config_file = input_uv.extra_keywords['telescope_config_name']
-            antenna_location_file = input_uv.extra_keywords['array_layout']
+        if 'obsparam' in input_uv.extra_keywords:
+            obs_param_file = input_uv.extra_keywords['obsparam']
+            telescope_config_file = input_uv.extra_keywords['telecfg']
+            antenna_location_file = input_uv.extra_keywords['layout']
             history += (' Based on config files: ' + obs_param_file + ', '
                         + telescope_config_file + ', ' + antenna_location_file)
         elif uv_container.filename is not None:
-            assert False
             history += ' Based on uvdata file(s): [' + ', '.join(uv_container.filename) + '].'
         history += ' Npus = ' + str(mpi.Npus) + '.'
 
@@ -839,7 +838,7 @@ def run_uvsim(params, return_uv=False, quiet=False):
     if rank == 0:
         start = Time.now()
         input_uv, beam_list, beam_dict = simsetup.initialize_uvdata_from_params(params)
-        skydata, source_list_name = simsetup.initialize_catalog_from_params(
+        skydata, _ = simsetup.initialize_catalog_from_params(
             params, input_uv, return_recarray=False
         )
         print(f"UVData initialization took {(Time.now() - start).to('minute'):.3f}")