Skip to content

fix(par-hit): align aoe entry checks and naming with the params schema #46

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.

Sign up for GitHub

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

Merged
ggmarshall merged 2 commits into from
Aug 16, 2026
Merged

fix(par-hit): align aoe entry checks and naming with the params schema #46

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca7f7e4
fix(par-hit): align aoe entry checks and naming with the params schema
ggmarshall Jul 29, 2026
ba29587
review: validate params entries explicitly instead of bare KeyError
ggmarshall Jul 29, 2026
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
20 changes: 11 additions & 9 deletions src/legenddataflowscripts/par/geds/hit/aoe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,13 @@ def run_aoe_calibration(
``{timestamp: plot_dict}`` mapping of existing plot dictionaries.
config : dict or str or list
A/E calibration configuration. Must contain ``run_aoe`` (bool),
``current_param``, ``energy_param``, ``cal_energy_param``,
``cut_field``, and ``threshold``.
``cal_energy_param``, ``cut_field``, and ``params`` — a mapping of
``{name: param_config}`` with one entry per A/E parameter to
calibrate. Each *param_config* must contain ``current_param`` and
``energy_param``; optional keys are ``dt_param``, ``dt_corr``,
``dep_correct``, ``dt_cut``, ``pdf``, ``mean_func``, ``sigma_func``,
``high_cut_val``, ``suffix`` (appended to the output parameter names
so entries don't collide), and ``plot_options``.
debug_mode : bool
Activates additional diagnostic output in :class:`~pygama.pargen.AoE_cal.CalAoE`.
Defaults to ``False``.
Expand Down Expand Up @@ -179,11 +184,8 @@ def eres_func(x):
exp, local_dict=cut_dict[next(iter(cut_dict))]["parameters"]
)

initial_param = (
"AoE_uncorr"
if param_config.get("suffix", None) is None
else f"AoE_Uncorr_{param_config['suffix']}"
)
suffix = param_config.get("suffix", None)
initial_param = "AoE_Uncorr" if suffix is None else f"AoE_Uncorr_{suffix}"
Comment thread
ggmarshall marked this conversation as resolved.
Resolved
data[initial_param] = (
data[param_config["current_param"]] / data[param_config["energy_param"]]
)
Expand Down Expand Up @@ -219,7 +221,7 @@ def eres_func(x):
data,
initial_param,
override_dict=override_dict,
suffix=param_config.get("suffix", None),
**({} if suffix is None else {"suffix": suffix}),
)

msg = f"A/E calibration completed in {time.time() - start:.2f} seconds"
Expand Down Expand Up @@ -386,7 +388,7 @@ def par_geds_hit_aoe() -> None:
if kwarg_dict["run_aoe"] is True:
require_config_keys(
kwarg_dict,
["current_param", "energy_param", "cal_energy_param", "cut_field"],
["cal_energy_param", "cut_field", "threshold", "params"],
f"aoe config ({args.config_file})",
)
params = [
Expand Down