Skip to content

Commit d8da22d

Browse files
committed
pre-commit fixes
1 parent 1072f57 commit d8da22d

4 files changed

+16
-14
lines changed

scripts/blinding_calibration.py

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import argparse
88
import json
99
import logging
10+
import os
1011
import pickle as pkl
1112

1213
os.environ["LGDO_CACHE"] = "false"

scripts/pars_hit_ecal.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def baseline_tracking_plots(files, lh5_path, plot_options=None):
123123
def energy_cal_th(
124124
data: pd.Dataframe,
125125
energy_params: list[str],
126-
cal_energy_params: list = None,
126+
cal_energy_params: list | None = None,
127127
selection_string: str = "",
128128
hit_dict: dict | None = None,
129129
cut_parameters: dict[str, int] | None = None,
@@ -150,7 +150,7 @@ def energy_cal_th(
150150
results_dict = {}
151151
plot_dict = {}
152152
full_object_dict = {}
153-
for energy_param, cal_energy_param in zip(energy_params,cal_energy_params):
153+
for energy_param, cal_energy_param in zip(energy_params, cal_energy_params):
154154
full_object_dict[cal_energy_param] = calibrate_parameter(
155155
energy_param,
156156
selection_string,
@@ -164,9 +164,7 @@ def energy_cal_th(
164164
tail_weight=tail_weight,
165165
)
166166
full_object_dict[cal_energy_param].calibrate_parameter(data)
167-
results_dict[cal_energy_param] = full_object_dict[
168-
energy_param
169-
].get_results_dict(data)
167+
results_dict[cal_energy_param] = full_object_dict[energy_param].get_results_dict(data)
170168
hit_dict.update(full_object_dict[cal_energy_param].hit_dict)
171169
if ~np.isnan(full_object_dict[cal_energy_param].pars).all():
172170
plot_dict[cal_energy_param] = (
@@ -211,11 +209,12 @@ def energy_cal_th(
211209
configs = LegendMetadata(path=args.configs)
212210
channel_dict = configs.on(args.timestamp, system=args.datatype)["snakemake_rules"]
213211
if args.tier == "hit":
214-
channel_dict =channel_dict["pars_hit_ecal"]["inputs"]["ecal_config"][args.channel]
212+
channel_dict = channel_dict["pars_hit_ecal"]["inputs"]["ecal_config"][args.channel]
215213
elif args.tier == "pht":
216-
channel_dict =channel_dict["pars_pht_ecal"]["inputs"]["ecal_config"][args.channel]
214+
channel_dict = channel_dict["pars_pht_ecal"]["inputs"]["ecal_config"][args.channel]
217215
else:
218-
raise ValueError("invalid tier")
216+
msg = "invalid tier"
217+
raise ValueError(msg)
219218

220219
kwarg_dict = Props.read_from(channel_dict)
221220

scripts/pars_pht_aoecal.py

-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import json
55
import logging
66
import os
7-
import re
87
import pathlib
98
import pickle as pkl
109
from typing import Callable
@@ -197,7 +196,6 @@ def run_splitter(files):
197196

198197
# run aoe cal
199198
if kwarg_dict.pop("run_aoe") is True:
200-
201199
params = [
202200
kwarg_dict["final_cut_field"],
203201
kwarg_dict["current_param"],
@@ -243,7 +241,6 @@ def run_splitter(files):
243241
)
244242
data["is_pulser"] = mask[threshold_mask]
245243

246-
247244
pdf = eval(kwarg_dict.pop("pdf")) if "pdf" in kwarg_dict else standard_aoe
248245

249246
mean_func = eval(kwarg_dict.pop("mean_func")) if "mean_func" in kwarg_dict else pol1

scripts/pars_pht_partcal.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
log = logging.getLogger(__name__)
2121

22+
2223
def update_cal_dicts(cal_dicts, update_dict):
2324
if re.match(r"(\d{8})T(\d{6})Z", list(cal_dicts)[0]):
2425
for tstamp in cal_dicts:
@@ -30,9 +31,10 @@ def update_cal_dicts(cal_dicts, update_dict):
3031
cal_dicts.update(update_dict)
3132
return cal_dicts
3233

34+
3335
def partition_energy_cal_th(
3436
data: pd.Datframe,
35-
hit_dicts:dict,
37+
hit_dicts: dict,
3638
energy_params: list[str],
3739
selection_string: str = "",
3840
threshold: int = 0,
@@ -205,7 +207,7 @@ def run_splitter(files):
205207
params=params,
206208
threshold=kwarg_dict["threshold"],
207209
return_selection_mask=True,
208-
cal_energy_param = kwarg_dict["energy_params"][0]
210+
cal_energy_param=kwarg_dict["energy_params"][0],
209211
)
210212

211213
# get pulser mask from tcm files
@@ -226,7 +228,10 @@ def run_splitter(files):
226228

227229
# run energy supercal
228230
hit_dicts, ecal_results, plot_dict, ecal_obj = partition_energy_cal_th(
229-
data, cal_dict, election_string=f"{kwarg_dict.pop('final_cut_field')}&(~is_pulser)", **kwarg_dict
231+
data,
232+
cal_dict,
233+
election_string=f"{kwarg_dict.pop('final_cut_field')}&(~is_pulser)",
234+
**kwarg_dict,
230235
)
231236

232237

0 commit comments

Comments
 (0)