From ac9a03c97ecba5a288ecf659dd78d0979fd398a2 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Tue, 5 Mar 2024 14:14:51 +0100 Subject: [PATCH] Speed up merge_frames by 45% using combined scalar offsets instead of full array operations --- libeos/file_reader.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libeos/file_reader.py b/libeos/file_reader.py index 7adb8e7..64de609 100644 --- a/libeos/file_reader.py +++ b/libeos/file_reader.py @@ -160,7 +160,7 @@ class AmorData: if True: self.filter_strange_times() - self.marge_frames() + self.merge_frames() self.filter_project_x() @@ -209,9 +209,9 @@ class AmorData: # define mask and filter y range self.mask_e = (self.config.yRange[0]<=detY_e) & (detY_e<=self.config.yRange[1]) - def marge_frames(self): - self.tof_e = np.remainder(self.tof_e-self.tofCut+self.tau, self.tau)+self.tofCut # tof shifted to 1 frame - self.tof_e = self.tof_e+self.tau*self.config.chopperPhaseOffset/180. # correction for time offset between chopper pulse and tof zero + def merge_frames(self): + total_offset = self.tofCut+self.tau*self.config.chopperPhaseOffset/180. + self.tof_e = np.remainder(self.tof_e-(self.tofCut-self.tau), self.tau)+total_offset # tof shifted to 1 frame def filter_strange_times(self): # filter 'strange' tof times > 2 tau