Skip to content

Commit

Permalink
Rename UserWindowSum to FixedWindowSum
Browse files Browse the repository at this point in the history
  • Loading branch information
watsonjj committed Apr 4, 2019
1 parent 80be3dc commit e510fd9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions ctapipe/image/extractor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
__all__ = [
'ImageExtractor',
'FullWaveformSum',
'UserWindowSum',
'FixedWindowSum',
'GlobalPeakWindowSum',
'LocalPeakWindowSum',
'NeighborPeakWindowSum',
Expand Down Expand Up @@ -254,9 +254,9 @@ def __call__(self, waveforms):
return charge, pulse_time


class UserWindowSum(ImageExtractor):
class FixedWindowSum(ImageExtractor):
"""
Extractor that sums within a window defined by the user.
Extractor that sums within a fixed window defined by the user.
"""
window_start = Int(
0, help='Define the start position for the integration window'
Expand Down
6 changes: 3 additions & 3 deletions ctapipe/image/tests/test_extractor.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
subtract_baseline,
ImageExtractor,
FullWaveformSum,
UserWindowSum,
FixedWindowSum,
GlobalPeakWindowSum,
LocalPeakWindowSum,
NeighborPeakWindowSum,
Expand Down Expand Up @@ -103,9 +103,9 @@ def test_full_waveform_sum(camera_waveforms):
assert_allclose(pulse_time[1][0], 62.359948, rtol=1e-3)


def test_user_window_sum(camera_waveforms):
def test_fixed_window_sum(camera_waveforms):
waveforms, _ = camera_waveforms
extractor = UserWindowSum(window_start=45)
extractor = FixedWindowSum(window_start=45)
charge, pulse_time = extractor(waveforms)

assert_allclose(charge[0][0], 232.559, rtol=1e-3)
Expand Down

0 comments on commit e510fd9

Please sign in to comment.