From d28eb92ac5acf97c0a9618a4db7ca48deecb7cdc Mon Sep 17 00:00:00 2001
From: Laurent Mercadier <laurent.mercadier@xfel.eu>
Date: Fri, 15 Nov 2024 08:52:58 +0100
Subject: [PATCH] pep8 and logging
---
src/toolbox_scs/detectors/digitizers.py | 27 +++++++++++++------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/toolbox_scs/detectors/digitizers.py b/src/toolbox_scs/detectors/digitizers.py
index 9dc268d..6ef8713 100644
--- a/src/toolbox_scs/detectors/digitizers.py
+++ b/src/toolbox_scs/detectors/digitizers.py
@@ -322,7 +322,8 @@ def get_peaks(run,
else:
mask = is_pulse_at(bpt.sel(trainId=valid_tid), pattern)
mask = mask.rename({'pulse_slot': extra_dim})
- mask = mask.assign_coords({extra_dim: np.arange(bpt.sizes['pulse_slot'])})
+ mask = mask.assign_coords(
+ {extra_dim: np.arange(bpt.sizes['pulse_slot'])})
mask_on = mask.where(mask, drop=True).fillna(False).astype(bool)
log.info(f'Bunch pattern of {pattern} changed during the run.')
pid = mask_on.coords[extra_dim]
@@ -383,7 +384,7 @@ def get_dig_avg_trace(run, mnemonic, ntrains=None):
total_tid = len(run.train_ids)
stride = int(np.max([1, np.floor(total_tid/ntrains)]))
sel = run.select_trains(np.s_[0:None:stride])
- m =run_mnemonics[mnemonic]
+ m = run_mnemonics[mnemonic]
raw_trace = sel.get_array(m['source'], m['key'], m['dim'])
raw_trace = raw_trace.mean(dim='trainId')
return raw_trace
@@ -737,7 +738,8 @@ def check_peak_params(run, mnemonic, raw_trace=None, ntrains=200, params=None,
return params
-def plotPeakIntegrationWindow(raw_trace, params, bp_params=None, show_all=False):
+def plotPeakIntegrationWindow(raw_trace, params, bp_params=None,
+ show_all=False):
if show_all:
fig, ax = plt.subplots(figsize=(6, 3), constrained_layout=True)
n = params['npulses']
@@ -818,7 +820,7 @@ def digitizer_type(run, source):
Finds the digitizer type based on the class Id / name of the source.
Example source: 'SCS_UTC1_MCP/ADC/1'. Defaults to ADQ412 if not found.
"""
- ret = None
+ ret = None
if '_MCP/ADC/1' in source:
ret = 'FastADC'
if '_ADQ/ADC/1' in source:
@@ -828,8 +830,7 @@ def digitizer_type(run, source):
'FastAdcLegacy': 'FastADC',
'AdqDigitizer': 'ADQ412',
'PyADCChannel': 'FastADC',
- 'PyADCChannelLegacy': 'FastADC'
- }
+ 'PyADCChannelLegacy': 'FastADC'}
try:
source = source.split(':')[0]
classId = run.get_run_value(source, 'classId.value')
@@ -1327,7 +1328,7 @@ def extract_digitizer_peaks(proposal, runNB, mnemonic, bunchPattern=None,
if bunchPattern == 'scs_ppl':
pattern = OpticalLaserPulses(run)
except Exception as e:
- print(e)
+ log.warning(e)
bunchPattern = None
if integParams is not None:
@@ -1347,10 +1348,11 @@ def extract_digitizer_peaks(proposal, runNB, mnemonic, bunchPattern=None,
period_from_bp = min(np.diff(pulse_ids)) * pulse_period
if (npulses_from_bp != params['npulses'] or
period_from_bp != params['period']):
- print(f'Integration parameters (npulses={params["npulses"]}, '
- f'period={params["period"]}) do not match '
- f'the bunch pattern (npulses={npulses_from_bp}, '
- f'period={period_from_bp}). Using bunch pattern parameters.')
+ log.warning(f'Integration parameters '
+ f'(npulses={params["npulses"]}, '
+ f'period={params["period"]}) do not match the '
+ f'the bunch pattern (npulses={npulses_from_bp}, '
+ f'period={period_from_bp}). Using bunch pattern parameters.')
params['npulses'] = npulses_from_bp
params['period'] = period_from_bp
else:
@@ -1393,12 +1395,11 @@ def extract_digitizer_peaks(proposal, runNB, mnemonic, bunchPattern=None,
'pattern parameters.')
params['period'] = period
params['npulses'] = min(len(trace) // period, npulses)
- print(params['npulses'])
if pulse_ids is None:
pulse_ids = np.arange(params['npulses'], dtype=np.uint64)
if params is None:
- print('Could not find peak integration parameters.')
+ log.warning('Could not find peak integration parameters.')
return xr.DataArray()
# extract peaks
--
GitLab