diff --git a/src/roman_datamodels/maker_utils/_common_meta.py b/src/roman_datamodels/maker_utils/_common_meta.py index 36f6ee29..da52c0ea 100644 --- a/src/roman_datamodels/maker_utils/_common_meta.py +++ b/src/roman_datamodels/maker_utils/_common_meta.py @@ -151,7 +151,7 @@ def mk_sky_background(**kwargs): roman_datamodels.stnode.SkyBackground """ sb = stnode.SkyBackground() - sb["level"] = kwargs.get("level", NONUM * (u.MJy / u.sr)) + sb["level"] = kwargs.get("level", NONUM) sb["method"] = kwargs.get("method", "None") sb["subtracted"] = kwargs.get("subtracted", False) diff --git a/src/roman_datamodels/maker_utils/_datamodels.py b/src/roman_datamodels/maker_utils/_datamodels.py index d087ff68..f6f97fe5 100644 --- a/src/roman_datamodels/maker_utils/_datamodels.py +++ b/src/roman_datamodels/maker_utils/_datamodels.py @@ -185,20 +185,14 @@ def mk_level3_mosaic(*, shape=(4088, 4088), n_images=2, filepath=None, **kwargs) wfi_mosaic = stnode.WfiMosaic() wfi_mosaic["meta"] = mk_mosaic_meta(**kwargs.get("meta", {})) - wfi_mosaic["data"] = kwargs.get("data", u.Quantity(np.zeros(shape, dtype=np.float32), u.MJy / u.sr, dtype=np.float32)) - wfi_mosaic["err"] = kwargs.get("err", u.Quantity(np.zeros(shape, dtype=np.float32), u.MJy / u.sr, dtype=np.float32)) + wfi_mosaic["data"] = kwargs.get("data", np.zeros(shape, dtype=np.float32)) + wfi_mosaic["err"] = kwargs.get("err", np.zeros(shape, dtype=np.float32)) wfi_mosaic["context"] = kwargs.get("context", np.zeros((n_images,) + shape, dtype=np.uint32)) wfi_mosaic["weight"] = kwargs.get("weight", np.zeros(shape, dtype=np.float32)) - wfi_mosaic["var_poisson"] = kwargs.get( - "var_poisson", u.Quantity(np.zeros(shape, dtype=np.float32), u.MJy**2 / u.sr**2, dtype=np.float32) - ) - wfi_mosaic["var_rnoise"] = kwargs.get( - "var_rnoise", u.Quantity(np.zeros(shape, dtype=np.float32), u.MJy**2 / u.sr**2, dtype=np.float32) - ) - wfi_mosaic["var_flat"] = kwargs.get( - "var_flat", u.Quantity(np.zeros(shape, dtype=np.float32), u.MJy**2 / u.sr**2, dtype=np.float32) - ) + wfi_mosaic["var_poisson"] = kwargs.get("var_poisson", np.zeros(shape, dtype=np.float32)) + wfi_mosaic["var_rnoise"] = kwargs.get("var_rnoise", np.zeros(shape, dtype=np.float32)) + wfi_mosaic["var_flat"] = kwargs.get("var_flat", np.zeros(shape, dtype=np.float32)) wfi_mosaic["cal_logs"] = mk_cal_logs(**kwargs) wfi_mosaic["meta"]["wcs"] = mk_wcs() diff --git a/src/roman_datamodels/maker_utils/_tagged_nodes.py b/src/roman_datamodels/maker_utils/_tagged_nodes.py index d58af76f..f358e81d 100644 --- a/src/roman_datamodels/maker_utils/_tagged_nodes.py +++ b/src/roman_datamodels/maker_utils/_tagged_nodes.py @@ -1,5 +1,3 @@ -from astropy import units as u - from roman_datamodels import stnode from ._base import NONUM @@ -15,12 +13,12 @@ def mk_photometry(**kwargs): roman_datamodels.stnode.Photometry """ phot = stnode.Photometry() - phot["conversion_microjanskys"] = kwargs.get("conversion_microjanskys", NONUM * u.uJy / u.arcsec**2) - phot["conversion_megajanskys"] = kwargs.get("conversion_megajanskys", NONUM * u.MJy / u.sr) - phot["pixelarea_steradians"] = kwargs.get("pixelarea_steradians", NONUM * u.sr) - phot["pixelarea_arcsecsq"] = kwargs.get("pixelarea_arcsecsq", NONUM * u.arcsec**2) - phot["conversion_microjanskys_uncertainty"] = kwargs.get("conversion_microjanskys_uncertainty", NONUM * u.uJy / u.arcsec**2) - phot["conversion_megajanskys_uncertainty"] = kwargs.get("conversion_megajanskys_uncertainty", NONUM * u.MJy / u.sr) + phot["conversion_microjanskys"] = kwargs.get("conversion_microjanskys", float(NONUM)) + phot["conversion_megajanskys"] = kwargs.get("conversion_megajanskys", float(NONUM)) + phot["pixelarea_steradians"] = kwargs.get("pixelarea_steradians", float(NONUM)) + phot["pixelarea_arcsecsq"] = kwargs.get("pixelarea_arcsecsq", float(NONUM)) + phot["conversion_microjanskys_uncertainty"] = kwargs.get("conversion_microjanskys_uncertainty", float(NONUM)) + phot["conversion_megajanskys_uncertainty"] = kwargs.get("conversion_megajanskys_uncertainty", float(NONUM)) return phot diff --git a/tests/test_models.py b/tests/test_models.py index d6c785ca..9005a25c 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -683,16 +683,12 @@ def test_make_level3_mosaic(): wfi_mosaic = utils.mk_level3_mosaic(shape=(8, 8)) assert wfi_mosaic.data.dtype == np.float32 - assert wfi_mosaic.data.unit == u.MJy / u.sr assert wfi_mosaic.err.dtype == np.float32 - assert wfi_mosaic.err.unit == u.MJy / u.sr assert wfi_mosaic.context.dtype == np.uint32 assert wfi_mosaic.weight.dtype == np.float32 assert wfi_mosaic.var_poisson.dtype == np.float32 - assert wfi_mosaic.var_poisson.unit == u.MJy**2 / u.sr**2 assert wfi_mosaic.var_rnoise.dtype == np.float32 - assert wfi_mosaic.var_rnoise.unit == u.MJy**2 / u.sr**2 assert wfi_mosaic.var_flat.dtype == np.float32 assert isinstance(wfi_mosaic.cal_logs[0], str)