Skip to content

Commit d330a4a

Browse files
author
Benjamin Moody
committed
multi_to_single: rearrange for readability.
1 parent 6cd18ba commit d330a4a

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

wfdb/io/record.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1426,16 +1426,16 @@ def multi_to_single(self, physical, return_res=64, expanded=False):
14261426
# Copy over the signals directly. Recall there are no
14271427
# empty segments in fixed layout records.
14281428
for i in range(self.n_seg):
1429+
signals = getattr(self.segments[i], sig_attr)
14291430
if expanded:
1430-
signals = getattr(self.segments[i], sig_attr)
14311431
for ch in range(self.n_sig):
14321432
start = start_samps[i] * samps_per_frame[ch]
14331433
end = end_samps[i] * samps_per_frame[ch]
14341434
combined_signal[ch][start:end] = signals[ch]
14351435
else:
1436-
combined_signal[start_samps[i] : end_samps[i], :] = getattr(
1437-
self.segments[i], sig_attr
1438-
)
1436+
start = start_samps[i]
1437+
end = end_samps[i]
1438+
combined_signal[start:end, :] = signals
14391439
else:
14401440
# Copy over the signals into the matching channels
14411441
for i in range(1, self.n_seg):
@@ -1446,21 +1446,20 @@ def multi_to_single(self, physical, return_res=64, expanded=False):
14461446
segment_channels = _get_wanted_channels(
14471447
fields["sig_name"], seg.sig_name, pad=True
14481448
)
1449+
signals = getattr(seg, sig_attr)
14491450
for ch in range(self.n_sig):
14501451
# Copy over relevant signal
14511452
if segment_channels[ch] is not None:
14521453
if expanded:
1453-
signals = getattr(seg, sig_attr)
14541454
signal = signals[segment_channels[ch]]
14551455
start = start_samps[i] * samps_per_frame[ch]
14561456
end = end_samps[i] * samps_per_frame[ch]
14571457
combined_signal[ch][start:end] = signal
14581458
else:
1459-
combined_signal[
1460-
start_samps[i] : end_samps[i], ch
1461-
] = getattr(seg, sig_attr)[
1462-
:, segment_channels[ch]
1463-
]
1459+
signal = signals[:, segment_channels[ch]]
1460+
start = start_samps[i]
1461+
end = end_samps[i]
1462+
combined_signal[start:end, ch] = signal
14641463

14651464
# Create the single segment Record object and set attributes
14661465
record = Record()

0 commit comments

Comments
 (0)