eos/file_reader.py aktualisiert
Unit Testing / test (3.11) (pull_request) Successful in 1m4s
Unit Testing / test (3.8) (pull_request) Successful in 1m3s
Unit Testing / test (3.10) (pull_request) Successful in 1m28s
Unit Testing / test (3.12) (pull_request) Successful in 1m28s
Unit Testing / test (3.9) (pull_request) Successful in 1m25s
Pull Request Merged / autoupdate_minor (pull_request) Successful in 4s
Unit Testing / test (3.11) (pull_request) Successful in 1m4s
Unit Testing / test (3.8) (pull_request) Successful in 1m3s
Unit Testing / test (3.10) (pull_request) Successful in 1m28s
Unit Testing / test (3.12) (pull_request) Successful in 1m28s
Unit Testing / test (3.9) (pull_request) Successful in 1m25s
Pull Request Merged / autoupdate_minor (pull_request) Successful in 4s
Some simplifications and cleanups
This commit is contained in:
+5
-6
@@ -575,13 +575,12 @@ class AmorEventData(AmorHeader):
|
||||
plse = np.array([0, 5, 6, 11])
|
||||
base = np.array([2, 3, 8, 9])
|
||||
_time = self._beam_monitor.time
|
||||
_signal = self._beam_monitor.signal[(self.eventStartTime<=_time)&
|
||||
(_time<=packets.time[-1])]
|
||||
_time = _time[(self.eventStartTime<=_time)&
|
||||
(_time<=packets.time[-1])]
|
||||
beam_monitor = np.recarray(shape=np.shape(_time)[0], dtype=BM_TYPE)
|
||||
fltr = (self.eventStartTime<=_time)&(_time<=packets.time[-1])
|
||||
_time = _time[fltr]
|
||||
_signal = self._beam_monitor.signal[fltr]
|
||||
beam_monitor = np.recarray(shape=_time.shape[0], dtype=BM_TYPE)
|
||||
beam_monitor.time = _time
|
||||
beam_monitor.value[:] = np.sum(_signal[:, plse], axis=1) - np.sum(_signal[:, base], axis=1)
|
||||
beam_monitor.value = _signal[:, plse].sum(axis=1) - _signal[:, base].sum(axis=1)
|
||||
return beam_monitor
|
||||
|
||||
def info(self):
|
||||
|
||||
Reference in New Issue
Block a user