Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SP-1663: moving object magtype being used appropriately #432

Merged
merged 4 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions rubin_sim/maf/batches/moving_objects_batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -910,6 +910,7 @@ def characterization_inner_batch(
colmap=None,
run_name="run_name",
objtype="",
magtype="asteroid",
albedo=None,
h_mark=None,
constraint_info_label="",
Expand Down Expand Up @@ -950,7 +951,7 @@ def characterization_inner_batch(
display_dict = {"group": f"{objtype}"}

# Stackers
magStacker = stackers.MoMagStacker(loss_col="dmag_detect")
magStacker = stackers.MoMagStacker(loss_col="dmag_detect", magtype=magtype)
eclStacker = stackers.EclStacker()
stackerList = [magStacker, eclStacker]

Expand Down Expand Up @@ -1107,6 +1108,7 @@ def characterization_outer_batch(
colmap=None,
run_name="run_name",
objtype="",
magtype="asteroid",
albedo=None,
h_mark=None,
constraint_info_label="",
Expand Down Expand Up @@ -1147,7 +1149,7 @@ def characterization_outer_batch(
display_dict = {"group": f"{objtype}"}

# Stackers
magStacker = stackers.MoMagStacker(loss_col="dmag_detect")
magStacker = stackers.MoMagStacker(loss_col="dmag_detect", magtype=magtype)
eclStacker = stackers.EclStacker()
stackerList = [magStacker, eclStacker]

Expand Down
3 changes: 2 additions & 1 deletion rubin_sim/maf/batches/science_radar_batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,8 @@ def science_radar_batch(
sqlconstraint,
maps_list=[dustmap],
info_label=info_label,
summary_metrics=summaryMetrics + [ThreebyTwoSummary, ThreebyTwoSummary_simple],
summary_metrics=summaryMetrics + [ThreebyTwoSummary],
# , ThreebyTwoSummary_simple],
display_dict=displayDict,
)
displayDict["order"] += 1
Expand Down
2 changes: 1 addition & 1 deletion rubin_sim/maf/stackers/mo_stackers.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def __init__(
self.cols_req = [m5_col, v_mag_col, color_col, loss_col]
elif magtype.startswith("comet"):
# magtype should be = comet_oort comet_short or comet_mbc
comet_type = magtype.split(magtype, "_")[-1]
comet_type = magtype.split("_")[-1]
self.mag_stacker = CometAppMagStacker(
comet_type=comet_type,
ap=0.04,
Expand Down
Loading