Skip to content

Commit 8615dba

Browse files
committed
Replace .format by f-strings
1 parent ea18449 commit 8615dba

File tree

1 file changed

+26
-32
lines changed

1 file changed

+26
-32
lines changed

src/nectarchain/user_scripts/ltibaldo/pedestal_NSB.py

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@
102102

103103
for itemp, uberset in enumerate(pedfiles):
104104
temp = uberset["T"]
105-
print("Analyzing data for temperature {}".format(temp))
105+
print(f"Analyzing data for temperature {temp}")
106106

107107
# create output directory if needed
108-
outdir = os.path.join(outfigroot, "NSB_T{}deg".format(temp))
108+
outdir = os.path.join(outfigroot, f"NSB_T{temp}deg")
109109
if not os.path.exists(outdir):
110110
os.makedirs(outdir)
111111

@@ -118,7 +118,7 @@
118118
flagged_pixels = 0
119119

120120
for pixel_id in pixel_process:
121-
print("Working on pixel {}".format(pixel_id))
121+
print(f"Working on pixel {pixel_id}")
122122
# fill panda dataframe
123123
nsbs = []
124124
channels = []
@@ -128,16 +128,17 @@
128128
for dataset in uberset["data"]:
129129
for run_number in dataset["runs"]:
130130
run_number = int(run_number)
131-
filename = os.environ[
132-
"NECTARCAMDATA"
133-
] + "/runs/pedestal_cfilt3s_{}.h5".format(run_number)
131+
filename = (
132+
os.environ["NECTARCAMDATA"]
133+
+ f"/runs/pedestal_cfilt3s_{run_number}.h5"
134+
)
134135
h5file = tables.open_file(filename)
135136
table = h5file.root["data_combined"]["NectarCAMPedestalContainer_0"][0]
136137
for channel in ["hg", "lg"]:
137-
pedestal = table["pedestal_mean_{}".format(channel)][
138+
pedestal = table[f"pedestal_mean_{channel}"][
138139
table["pixels_id"] == pixel_id
139140
][0]
140-
rms = table["pedestal_charge_std_{}".format(channel)][
141+
rms = table[f"pedestal_charge_std_{channel}"][
141142
table["pixels_id"] == pixel_id
142143
][0]
143144
avgped = np.average(pedestal)
@@ -212,27 +213,24 @@
212213
slopes_rms_lg[pixel_id] = slope
213214
if pixel_id in pixel_display:
214215
ax.annotate(
215-
"y = {:.4f} I + {:.4f}".format(slope, intercept),
216+
f"y = {slope:.4f} I + {intercept:.4f}",
216217
(0.05, 0.85 - s * 0.05),
217218
color=colors[s],
218219
xycoords="axes fraction",
219220
)
220221

221222
if pixel_id in pixel_display:
222-
ax.set_title("Pixel {}, T {} deg".format(pixel_id, temp))
223-
fig.savefig("{}/pixel_{}_{}.png".format(outdir, pixel_id, k))
223+
ax.set_title(f"Pixel {pixel_id}, T {temp} deg")
224+
fig.savefig(f"{outdir}/pixel_{pixel_id}_{k}.png")
224225
del fig
225226
plt.close()
226227

227228
print(
228-
"{} pixels were flagged as bad by the pedestal estimation tool".format(
229-
flagged_pixels
230-
)
229+
f"{flagged_pixels} pixels were flagged as bad by the pedestal estimation tool"
231230
)
232231
print(
233-
"{} pixels were removed because they had a pedestal RMS exceeding {}".format(
234-
removed_pixels, rms_threshold
235-
)
232+
f"{removed_pixels} pixels were removed because they had a pedestal RMS "
233+
f"exceeding {rms_threshold}"
236234
)
237235

238236
slopes_width_hg[itemp] = slopes_rms_hg
@@ -259,17 +257,13 @@
259257
if k == 1:
260258
ax.set_yscale("log")
261259
if k == 0 and s == 0:
262-
ax.set_title("Pedestal slope (ADC/mA), hg, T {} deg".format(temp))
260+
ax.set_title(f"Pedestal slope (ADC/mA), hg, T {temp} deg")
263261
elif k == 0 and s == 1:
264-
ax.set_title("Pedestal slope (ADC/mA), lg, T {} deg".format(temp))
262+
ax.set_title(f"Pedestal slope (ADC/mA), lg, T {temp} deg")
265263
elif k == 1 and s == 0:
266-
ax.set_title(
267-
"Pedestal width slope (ADC^2/mA), hg, T {} deg".format(temp)
268-
)
264+
ax.set_title(f"Pedestal width slope (ADC^2/mA), hg, T {temp} deg")
269265
elif k == 1 and s == 1:
270-
ax.set_title(
271-
"Pedestal width slope (ADC^2/mA), lg, T {} deg".format(temp)
272-
)
266+
ax.set_title(f"Pedestal width slope (ADC^2/mA), lg, T {temp} deg")
273267
plt.axvline(np.nanmean(slopes), linestyle=":")
274268
plt.axvline(np.nanmean(slopes) - np.nanstd(slopes), linestyle=":")
275269
plt.axvline(np.nanmean(slopes) + np.nanstd(slopes), linestyle=":")
@@ -292,7 +286,7 @@
292286
disp.add_colorbar()
293287
disp.update()
294288
ax.set_title("")
295-
fig.savefig("{}/camera_{}.png".format(outdir, k))
289+
fig.savefig(f"{outdir}/camera_{k}.png")
296290

297291
# Ped width^2-I slope as a function of temp
298292
# create output directory if needed
@@ -308,7 +302,7 @@
308302
bad_pixels_hg = 0
309303
bad_pixels_lg = 0
310304
for pixel_id in pixel_process:
311-
print("Working on pixel {}".format(pixel_id))
305+
print(f"Working on pixel {pixel_id}")
312306

313307
for s in range(2): # channels
314308
isgood = True
@@ -353,16 +347,16 @@
353347
fig.subplots_adjust(top=0.9)
354348

355349
ax.annotate(
356-
"y = {:.4f} T + {:.4f}".format(slope, intercept),
350+
f"y = {slope:.4f} T + {intercept:.4f}",
357351
(0.05, 0.85 - s * 0.05),
358352
xycoords="axes fraction",
359353
)
360-
ax.set_title("Pixel {}, ".format(pixel_id, label))
361-
fig.savefig("{}/pixel_{}_{}.png".format(outdir, pixel_id, label))
354+
ax.set_title(f"Pixel {pixel_id}, {label}")
355+
fig.savefig(f"{outdir}/pixel_{pixel_id}_{label}.png")
362356
del fig
363357
plt.close()
364358

365-
print("Bad pixels: HG {}, LG {}".format(bad_pixels_hg, bad_pixels_lg))
359+
print(f"Bad pixels: HG {bad_pixels_hg}, LG {bad_pixels_lg}")
366360

367361
camera = CameraGeometry.from_name("NectarCam-003")
368362
camera = camera.transform_to(EngineeringCameraFrame())
@@ -402,4 +396,4 @@
402396
disp.add_colorbar()
403397
disp.update()
404398
ax.set_title("")
405-
fig.savefig("{}/camera.png".format(outdir))
399+
fig.savefig(f"{outdir}/camera.png")

0 commit comments

Comments
 (0)