Skip to content

Commit

Permalink
Code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@PaulHuwe
PaulHuwe committed May 1, 2024
1 parent 89a34e5 commit 4b42f79
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 428 deletions.
57 changes: 2 additions & 55 deletions src/roman_datamodels/maker_utils/_common_meta.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,62 +10,9 @@

from ._base import NONUM, NOSTR
from ._basic_meta import mk_basic_meta

# from ._ground import mk_base_exposure, mk_base_guidestar
from ._tagged_nodes import mk_photometry, mk_resample


# def mk_base_exposure(**kwargs):
# """
# Create a dummy BaseExposure instance with valid values for attributes
# required by the schema. Utilized by the model maker utilities below.

# Returns
# -------
# roman_datamodels.stnode.BaseExposure
# """
# exp = stnode.BaseExposure()
# exp["type"] = kwargs.get("type", "WFI_IMAGE")
# exp["start_time"] = kwargs.get("start_time", time.Time("2020-01-01T00:00:00.0", format="isot", scale="utc"))
# exp["ngroups"] = kwargs.get("ngroups", 6)
# exp["nframes"] = kwargs.get("nframes", 8)
# exp["data_problem"] = kwargs.get("data_problem", False)
# exp["frame_divisor"] = kwargs.get("frame_divisor", NONUM)
# exp["groupgap"] = kwargs.get("groupgap", 0)
# exp["frame_time"] = kwargs.get("frame_time", NONUM)
# exp["group_time"] = kwargs.get("group_time", NONUM)
# exp["exposure_time"] = kwargs.get("exposure_time", NONUM)
# exp["ma_table_name"] = kwargs.get("ma_table_name", NOSTR)
# exp["ma_table_number"] = kwargs.get("ma_table_number", NONUM)
# exp["read_pattern"] = kwargs.get("read_pattern", np.arange(1, 56).reshape((-1, 1)).tolist())

# return exp


# def mk_base_guidestar(**kwargs):
# """
# Create a dummy BaseGuidestar instance with valid values for attributes
# required by the schema. Utilized by the model maker utilities below.

# Returns
# -------
# roman_datamodels.stnode.GroundGuidestar
# """
# guide = stnode.BaseGuidestar()
# guide["gw_id"] = kwargs.get("gw_id", NOSTR)
# guide["gw_fgs_mode"] = kwargs.get("gw_fgs_mode", "WSM-ACQ-2")
# guide["data_start"] = kwargs.get("data_start", NONUM)
# guide["data_end"] = kwargs.get("data_end", NONUM)
# guide["gw_window_xstart"] = kwargs.get("gw_window_xstart", NONUM)
# guide["gw_window_ystart"] = kwargs.get("gw_window_ystart", NONUM)
# guide["gw_window_xstop"] = kwargs.get("gw_window_xstop", guide["gw_window_xstart"] + 170)
# guide["gw_window_ystop"] = kwargs.get("gw_window_ystop", guide["gw_window_ystart"] + 24)
# guide["gw_window_xsize"] = kwargs.get("gw_window_xsize", 170)
# guide["gw_window_ysize"] = kwargs.get("gw_window_ysize", 24)

# return guide


def mk_exposure(**kwargs):
"""
Create a dummy Exposure instance with valid values for attributes
Expand All @@ -76,7 +23,7 @@ def mk_exposure(**kwargs):
roman_datamodels.stnode.Exposure
"""
exp = stnode.Exposure()
# exp._data = mk_base_exposure(**kwargs)._data

exp["type"] = kwargs.get("type", "WFI_IMAGE")
exp["start_time"] = kwargs.get("start_time", time.Time("2020-01-01T00:00:00.0", format="isot", scale="utc"))
exp["ngroups"] = kwargs.get("ngroups", 6)
Expand Down Expand Up @@ -429,7 +376,7 @@ def mk_guidestar(**kwargs):
roman_datamodels.stnode.Guidestar
"""
guide = stnode.Guidestar()
# guide._data = mk_base_guidestar(**kwargs)._data

guide["gw_id"] = kwargs.get("gw_id", NOSTR)
guide["gw_fgs_mode"] = kwargs.get("gw_fgs_mode", "WSM-ACQ-2")
guide["data_start"] = kwargs.get("data_start", NONUM)
Expand Down
204 changes: 0 additions & 204 deletions src/roman_datamodels/maker_utils/_fps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,92 +9,6 @@
from ._base import NONUM, NOSTR, save_node
from ._fps_basic_meta import mk_fps_basic_meta

# def mk_base_exposure(**kwargs):
# """
# Create a dummy BaseExposure instance with valid values for attributes
# required by the schema. Utilized by the model maker utilities below.

# Returns
# -------
# roman_datamodels.stnode.BaseExposure
# """
# exp = stnode.GroundExposure()
# exp["type"] = kwargs.get("type", "WFI_IMAGE")
# exp["start_time"] = kwargs.get("start_time", time.Time("2020-01-01T00:00:00.0", format="isot", scale="utc"))
# exp["ngroups"] = kwargs.get("ngroups", 6)
# exp["nframes"] = kwargs.get("nframes", 8)
# exp["data_problem"] = kwargs.get("data_problem", False)
# exp["frame_divisor"] = kwargs.get("frame_divisor", NONUM)
# exp["groupgap"] = kwargs.get("groupgap", 0)
# exp["frame_time"] = kwargs.get("frame_time", NONUM)
# exp["group_time"] = kwargs.get("group_time", NONUM)
# exp["exposure_time"] = kwargs.get("exposure_time", NONUM)
# exp["ma_table_name"] = kwargs.get("ma_table_name", NOSTR)
# exp["ma_table_number"] = kwargs.get("ma_table_number", NONUM)
# exp["read_pattern"] = kwargs.get("read_pattern", np.arange(1, 56).reshape((-1, 1)).tolist())

# return exp


# def mk_base_guidestar(**kwargs):
# """
# Create a dummy BaseGuidestar instance with valid values for attributes
# required by the schema. Utilized by the model maker utilities below.

# Returns
# -------
# roman_datamodels.stnode.GroundGuidestar
# """
# guide = stnode.GroundGuidestar()
# guide["gw_id"] = kwargs.get("gw_id", NOSTR)
# guide["gw_fgs_mode"] = kwargs.get("gw_fgs_mode", "WSM-ACQ-2")
# guide["data_start"] = kwargs.get("data_start", NONUM)
# guide["data_end"] = kwargs.get("data_end", NONUM)
# guide["gw_window_xstart"] = kwargs.get("gw_window_xstart", NONUM)
# guide["gw_window_ystart"] = kwargs.get("gw_window_ystart", NONUM)
# guide["gw_window_xstop"] = kwargs.get("gw_window_xstop", guide["gw_window_xstart"] + 170)
# guide["gw_window_ystop"] = kwargs.get("gw_window_ystop", guide["gw_window_ystart"] + 24)
# guide["gw_window_xsize"] = kwargs.get("gw_window_xsize", 170)
# guide["gw_window_ysize"] = kwargs.get("gw_window_ysize", 24)

# return guide


# def mk_groundtest(**kwargs):
# """
# Create a dummy GroundGroundtest instance with valid values for attributes
# required by the schema. Utilized by the model maker utilities below.

# Returns
# -------
# roman_datamodels.stnode.GroundGroundtest
# """

# ground = stnode.Groundtest()
# ground["test_name"] = kwargs.get("test_name", NOSTR)
# ground["test_phase"] = kwargs.get("test_phase", NOSTR)
# ground["test_environment"] = kwargs.get("test_environment", NOSTR)
# ground["test_script"] = kwargs.get("test_script", NOSTR)
# ground["product_date"] = kwargs.get("product_date", time.Time("2020-01-01T00:00:00.0", format="isot", scale="utc"))
# ground["product_version"] = kwargs.get("product_version", NOSTR)
# ground["conversion_date"] = kwargs.get("conversion_date", time.Time("2020-01-01T00:00:00.0", format="isot", scale="utc"))
# ground["conversion_version"] = kwargs.get("conversion_version", NOSTR)
# ground["filename_pnt5"] = kwargs.get("filename_pnt5", NOSTR)
# ground["filepath_level_pnt5"] = kwargs.get("filepath_level_pnt5", NOSTR)
# ground["filename_l1a"] = kwargs.get("filename_l1a", NOSTR)
# ground["detector_id"] = kwargs.get("detector_id", NOSTR)
# ground["detector_temp"] = kwargs.get("detector_temp", NONUM)
# ground["frames_temp"] = kwargs.get("frames_temp", np.zeros(6, dtype=np.float64))
# ground["ota_temp"] = kwargs.get("ota_temp", NONUM)
# ground["rcs_on"] = kwargs.get("rcs_on", False)
# ground["readout_col_num"] = kwargs.get("readout_col_num", NONUM)
# ground["detector_pixel_size"] = kwargs.get(
# "detector_pixel_size", u.Quantity(np.zeros(6, dtype=np.float64), unit=u.cm, dtype=np.float64)
# )
# ground["sensor_error"] = kwargs.get("sensor_error", np.zeros(6, dtype=np.float64))

# return ground


def mk_fps_groundtest(**kwargs):
"""
Expand All @@ -109,53 +23,6 @@ def mk_fps_groundtest(**kwargs):
"""

ground = stnode.FpsGroundtest()
# ground._data = mk_groundtest(**kwargs)._data

# ground["activity_number"] = kwargs.get("activity_number", NONUM)
# ground["led_bank1_band_number_on"] = kwargs.get("led_bank1_band_number_on", [NONUM])
# ground["led_bank1_approx_wlen"] = kwargs.get(
# "led_bank1_approx_wlen", u.Quantity(np.zeros(6, dtype=np.float64), unit=u.nm, dtype=np.float64)
# )
# ground["led_bank2_approx_wlen"] = kwargs.get(
# "led_bank2_approx_wlen", u.Quantity(np.zeros(6, dtype=np.float64), unit=u.nm, dtype=np.float64)
# )
# ground["srcs_pd_voltage"] = kwargs.get("srcs_pd_voltage", NONUM)
# ground["srcs_led_flux"] = kwargs.get("srcs_led_flux", NONUM)
# ground["wfi_mce_srcs_bank1_led_i"] = kwargs.get(
# "wfi_mce_srcs_bank1_led_i", u.Quantity(np.zeros(6, dtype=np.uint32), unit=u.A, dtype=np.uint32)
# )
# ground["wfi_mce_srcs_bank1_led_range"] = kwargs.get("wfi_mce_srcs_bank1_led_range", NOSTR)
# ground["wfi_mce_srcs_bank2_led_i"] = kwargs.get(
# "wfi_mce_srcs_bank2_led_i", u.Quantity(np.zeros(6, dtype=np.uint32), unit=u.A, dtype=np.uint32)
# )
# ground["wfi_mce_srcs_bank2_led_range"] = kwargs.get("wfi_mce_srcs_bank2_led_range", NOSTR)
# ground["srcs_led_current"] = kwargs.get("srcs_led_current", NONUM)
# ground["wfi_opt_targettype"] = kwargs.get("wfi_opt_targettype", "FLAT-sRCS")
# ground["analysis_tag"] = kwargs.get("analysis_tag", NOSTR)
# ground["gsorc_pose_mode"] = kwargs.get("gsorc_pose_mode", NOSTR)
# ground["gsorc_pose_target"] = kwargs.get("gsorc_pose_target", NOSTR)
# ground["gsorc_sds_active_atten"] = kwargs.get("gsorc_sds_active_atten", NONUM)
# ground["gsorc_sds_lltfir_wave"] = kwargs.get("gsorc_sds_lltfir_wave", NONUM)
# ground["gsorc_sds_sorc_on"] = kwargs.get("gsorc_sds_sorc_on", False)
# ground["gsorc_sds_sorc_wlen"] = kwargs.get("gsorc_sds_sorc_wlen", NONUM)
# ground["gsorc_sds_active_source"] = kwargs.get("gsorc_sds_active_source", NOSTR)
# ground["gsorc_sds_dq_pulse"] = kwargs.get("gsorc_sds_dq_pulse", "pulse")
# ground["gsorc_sds_daq_pw"] = kwargs.get("gsorc_sds_daq_pw", u.Quantity(NONUM, u.ms))
# ground["gsorc_heater1_setpt"] = kwargs.get("gsorc_heater1_setpt", NONUM)
# ground["wfi_otp_wfi_ewa"] = kwargs.get("wfi_otp_wfi_ewa", NOSTR)
# ground["sca_temp"] = kwargs.get("sca_temp", u.Quantity(NONUM, u.K))
# ground["mpa_temp"] = kwargs.get("mpa_temp", u.Quantity(NONUM, u.K))
# ground["ewa_temp"] = kwargs.get("ewa_temp", u.Quantity(NONUM, u.K))
# ground["ewta_outer_heater_temp"] = kwargs.get("ewta_outer_heater_temp", u.Quantity(NONUM, u.K))
# ground["ewta_inner_heater_temp"] = kwargs.get("ewta_inner_heater_temp", u.Quantity(NONUM, u.K))
# ground["coba_temp_near_ewta"] = kwargs.get("coba_temp_near_ewta", u.Quantity(NONUM, u.K))
# ground["scea_temp"] = kwargs.get("scea_temp", u.Quantity(NONUM, u.K))
# ground["wfi_sce_1_vbiasgate_v"] = kwargs.get("wfi_sce_1_vbiasgate_v", u.Quantity(NONUM, u.V))
# ground["wfi_sce_1_vbiaspwr_i"] = kwargs.get("wfi_sce_1_vbiaspwr_i", u.Quantity(NONUM, u.A))
# ground["wfi_sce_1_vbiaspwr_v"] = kwargs.get("wfi_sce_1_vbiaspwr_v", u.Quantity(NONUM, u.V))
# ground["wfi_sce_1_vreset_v"] = kwargs.get("wfi_sce_1_vreset_v", u.Quantity(NONUM, u.V))
# ground["wfi_sce_1_vreset_i"] = kwargs.get("wfi_sce_1_vreset_i", u.Quantity(NONUM, u.A))
# ground["wfi_mcu_a_offs_csense_fpssen"] = kwargs.get("wfi_mcu_a_offs_csense_fpssen", u.Quantity(NONUM, u.K))

ground["test_name"] = kwargs.get("test_name", NOSTR)
ground["test_phase"] = kwargs.get("test_phase", NOSTR)
Expand Down Expand Up @@ -274,74 +141,3 @@ def mk_fps(*, shape=(8, 4096, 4096), filepath=None, **kwargs):
)

return save_node(fps, filepath=filepath)


# def mk_fps_meta(**kwargs):
# """
# Create a dummy fps metadata dictionary with valid values for attributes

# Returns
# -------
# dict (defined by the fps-1.0.0.meta schema)
# """

# meta = mk_fps_common_meta(**kwargs)
# meta["groundtest"] = mk_fps_groundtest(**kwargs.get("groundtest", {}))

# return meta


# def mk_fps(*, shape=(8, 4096, 4096), filepath=None, **kwargs):
# """
# Create a dummy fps instance (or file) with arrays and valid
# values for attributes required by the schema.

# Parameters
# ----------
# shape : tuple, int
# (optional, keyword-only) (z, y, x) Shape of data array. This includes a
# four-pixel border representing the reference pixels. Default is
# (8, 4096, 4096)
# (8 integrations, 4088 x 4088 represent the science pixels, with the
# additional being the border reference pixels).

# filepath : str
# (optional, keyword-only) File name and path to write model to.

# Returns
# -------
# roman_datamodels.stnode.fps
# """

# if len(shape) != 3:
# shape = (8, 4096, 4096)
# warnings.warn("Input shape must be 3D. Defaulting to (8, 4096, 4096)")

# fps = stnode.fps()
# fps["meta"] = mk_fps_meta(**kwargs.get("meta", {}))

# n_groups = shape[0]

# fps["data"] = kwargs.get("data", u.Quantity(np.zeros(shape, dtype=np.uint16), u.DN, dtype=np.uint16))

# # add amp 33 ref pix
# fps["amp33"] = kwargs.get("amp33", u.Quantity(np.zeros((n_groups, 4096, 128), dtype=np.uint16), u.DN, dtype=np.uint16))
# fps["amp33_reset_reads"] = kwargs.get(
# "amp33_reset_reads", u.Quantity(np.zeros((n_groups, 4096, 128), dtype=np.uint16), u.DN, dtype=np.uint16)
# )
# fps["amp33_reference_read"] = kwargs.get(
# "amp33_reference_read", u.Quantity(np.zeros((n_groups, 4096, 128), dtype=np.uint16), u.DN, dtype=np.uint16)
# )

# # add guidewindow and reference
# fps["guidewindow"] = kwargs.get(
# "guidewindow", u.Quantity(np.zeros((n_groups, 4096, 128), dtype=np.uint16), u.DN, dtype=np.uint16)
# )
# fps["reference_read"] = kwargs.get(
# "reference_read", u.Quantity(np.zeros((n_groups, 4096, 128), dtype=np.uint16), u.DN, dtype=np.uint16)
# )
# fps["reset_reads"] = kwargs.get(
# "reset_reads", u.Quantity(np.zeros((n_groups, 4096, 128), dtype=np.uint16), u.DN, dtype=np.uint16)
# )

# return save_node(fps, filepath=filepath)
Loading

0 comments on commit 4b42f79

Please sign in to comment.