amor-eos 3.3.2__tar.gz → 3.3.4__tar.gz

{amor_eos-3.3.2 → amor_eos-3.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amor_eos
-Version: 3.3.2
+Version: 3.3.4
 Summary: EOS reflectometry reduction for AMOR instrument
 Author: Jochen Stahn - Paul Scherrer Institut
 Author-email: jochen.stahn@psi.ch

{amor_eos-3.3.2 → amor_eos-3.3.4}/amor_eos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amor_eos
-Version: 3.3.2
+Version: 3.3.4
 Summary: EOS reflectometry reduction for AMOR instrument
 Author: Jochen Stahn - Paul Scherrer Institut
 Author-email: jochen.stahn@psi.ch

{amor_eos-3.3.2 → amor_eos-3.3.4}/eos/__init__.py

@@ -2,5 +2,5 @@
 Package to handle data redction at the AMOR instrument to be used by __main__.py script.
 """
 
-__version__ = '3.3.2'
-__date__    = '2026-08-24'
+__version__ = '3.3.4'
+__date__    = '2026-08-27'

{amor_eos-3.3.2 → amor_eos-3.3.4}/eos/file_reader.py

@@ -221,7 +221,8 @@ class AmorHeader:
         self._start_time_ns = np.uint64(start_timestamp*1e9)
 
         # read general information and first data set
-        title = self.rv('title')
+        # make sure title has only a single line
+        title = self.rv('title').replace('\r', ' ').replace('\n', ' ').replace('  ', ' ')
         proposal_id = self.rv('proposal_id')
         user_name = self.rv('user_name')
         user_affiliation = self.rv('user_affiliation', default='unknown')
@@ -571,18 +572,16 @@ class AmorEventData(AmorHeader):
     def read_beam_monitor_stream(self, packets):
         if self._beam_monitor is None:
             return None
-        _signal = self._beam_monitor.signal
-        _time = self._beam_monitor.time
         plse = np.array([0, 5, 6, 11])
         base = np.array([2, 3, 8, 9])
-        i = 0
-        beam_monitor = np.recarray(shape=np.shape(packets.time)[0], dtype=BM_TYPE)
-        for tt, tme in enumerate(_time):
-            if (tme>=packets.time[0])&(tme<=packets.time[-1]):
-                beam_monitor.value[i] = _signal[tt][plse].sum() - _signal[tt][base].sum()
-                beam_monitor.time[i] = tme
-                i += 1
-        return beam_monitor[:i+1]
+        _time = self._beam_monitor.time
+        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 = _signal[:, plse].sum(axis=1) - _signal[:, base].sum(axis=1)
+        return beam_monitor
 
     def info(self):
         output = ""