From b7e16124652323620bc85017bcbcb409ff4e8b85 Mon Sep 17 00:00:00 2001 From: Evan Musterman Date: Tue, 23 Jun 2026 14:13:19 -0400 Subject: [PATCH 1/2] Additional scaler channels available for SRX --- pyxrf/model/load_data_from_db.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyxrf/model/load_data_from_db.py b/pyxrf/model/load_data_from_db.py index fc995b53..1c0daf9a 100644 --- a/pyxrf/model/load_data_from_db.py +++ b/pyxrf/model/load_data_from_db.py @@ -1851,6 +1851,7 @@ def map_data2D_srx_new( d_xs, d_xs_sum, N_xs = [], [], 0 d_xs2, d_xs2_sum, N_xs2 = [], [], 0 sclr_list = ["i0", "i0_time", "time", "im", "it"] + sclr_list += [f'i{n:02}' for n in range(5, 32 + 1)] sclr_dict = {} fast_pos, slow_pos = [], [] @@ -2404,6 +2405,7 @@ def map_data2D_srx_new_tiled( raise ValueError(f"No fluorescence data is found for the experiment {run_id_uid!r}") sclr_list = ["i0", "i0_time", "im", "it"] + sclr_list += [f'i{n:02}' for n in range(5, 32 + 1)] sclr_dict = dict() for k in sclr_list: if k in data_stream0: From 6fbeea78f2d50877025f40914fc2abc9c5f242b3 Mon Sep 17 00:00:00 2001 From: Evan Musterman Date: Wed, 1 Jul 2026 11:40:08 -0400 Subject: [PATCH 2/2] Applied linter --- pyxrf/model/load_data_from_db.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyxrf/model/load_data_from_db.py b/pyxrf/model/load_data_from_db.py index 1c0daf9a..3e11d925 100644 --- a/pyxrf/model/load_data_from_db.py +++ b/pyxrf/model/load_data_from_db.py @@ -1851,7 +1851,7 @@ def map_data2D_srx_new( d_xs, d_xs_sum, N_xs = [], [], 0 d_xs2, d_xs2_sum, N_xs2 = [], [], 0 sclr_list = ["i0", "i0_time", "time", "im", "it"] - sclr_list += [f'i{n:02}' for n in range(5, 32 + 1)] + sclr_list += [f"i{n:02}" for n in range(5, 32 + 1)] sclr_dict = {} fast_pos, slow_pos = [], [] @@ -2405,7 +2405,7 @@ def map_data2D_srx_new_tiled( raise ValueError(f"No fluorescence data is found for the experiment {run_id_uid!r}") sclr_list = ["i0", "i0_time", "im", "it"] - sclr_list += [f'i{n:02}' for n in range(5, 32 + 1)] + sclr_list += [f"i{n:02}" for n in range(5, 32 + 1)] sclr_dict = dict() for k in sclr_list: if k in data_stream0: