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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. {amor_eos-3.3.3 → amor_eos-3.3.4}/PKG-INFO +1 -1
  2. {amor_eos-3.3.3 → amor_eos-3.3.4}/amor_eos.egg-info/PKG-INFO +1 -1
  3. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/__init__.py +2 -2
  4. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/file_reader.py +8 -10
  5. {amor_eos-3.3.3 → amor_eos-3.3.4}/LICENSE +0 -0
  6. {amor_eos-3.3.3 → amor_eos-3.3.4}/README.rst +0 -0
  7. {amor_eos-3.3.3 → amor_eos-3.3.4}/amor_eos.egg-info/SOURCES.txt +0 -0
  8. {amor_eos-3.3.3 → amor_eos-3.3.4}/amor_eos.egg-info/dependency_links.txt +0 -0
  9. {amor_eos-3.3.3 → amor_eos-3.3.4}/amor_eos.egg-info/entry_points.txt +0 -0
  10. {amor_eos-3.3.3 → amor_eos-3.3.4}/amor_eos.egg-info/requires.txt +0 -0
  11. {amor_eos-3.3.3 → amor_eos-3.3.4}/amor_eos.egg-info/top_level.txt +0 -0
  12. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/__main__.py +0 -0
  13. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/command_line.py +0 -0
  14. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/compat.py +0 -0
  15. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/const.py +0 -0
  16. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/e2h.py +0 -0
  17. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/event_analysis.py +0 -0
  18. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/event_data_types.py +0 -0
  19. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/event_handling.py +0 -0
  20. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/header.py +0 -0
  21. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/helpers.py +0 -0
  22. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/helpers_fallback.py +0 -0
  23. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/helpers_numba.py +0 -0
  24. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/instrument.py +0 -0
  25. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/kafka_events.py +0 -0
  26. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/kafka_serializer.py +0 -0
  27. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/logconfig.py +0 -0
  28. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/ls.py +0 -0
  29. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/nicos.py +0 -0
  30. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/nicos_interface.py +0 -0
  31. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/normalization.py +0 -0
  32. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/options.py +0 -0
  33. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/path_handling.py +0 -0
  34. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/projection.py +0 -0
  35. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/reduction_e2h.py +0 -0
  36. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/reduction_kafka.py +0 -0
  37. {amor_eos-3.3.3 → amor_eos-3.3.4}/eos/reduction_reflectivity.py +0 -0
  38. {amor_eos-3.3.3 → amor_eos-3.3.4}/pyproject.toml +0 -0
  39. {amor_eos-3.3.3 → amor_eos-3.3.4}/setup.cfg +0 -0
  40. {amor_eos-3.3.3 → amor_eos-3.3.4}/tests/test_event_handling.py +0 -0
  41. {amor_eos-3.3.3 → amor_eos-3.3.4}/tests/test_full_analysis.py +0 -0
  42. {amor_eos-3.3.3 → amor_eos-3.3.4}/tests/test_full_analysis_v2.py +0 -0
{amor_eos-3.3.3 → amor_eos-3.3.4}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: amor_eos
3
- Version: 3.3.3
3
+ Version: 3.3.4
4
4
  Summary: EOS reflectometry reduction for AMOR instrument
5
5
  Author: Jochen Stahn - Paul Scherrer Institut
6
6
  Author-email: jochen.stahn@psi.ch
{amor_eos-3.3.3 → amor_eos-3.3.4}/amor_eos.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: amor_eos
3
- Version: 3.3.3
3
+ Version: 3.3.4
4
4
  Summary: EOS reflectometry reduction for AMOR instrument
5
5
  Author: Jochen Stahn - Paul Scherrer Institut
6
6
  Author-email: jochen.stahn@psi.ch
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/__init__.py RENAMED
@@ -2,5 +2,5 @@
2
2
  Package to handle data redction at the AMOR instrument to be used by __main__.py script.
3
3
  """
4
4
 
5
- __version__ = '3.3.3'
6
- __date__ = '2026-08-24'
5
+ __version__ = '3.3.4'
6
+ __date__ = '2026-08-27'
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/file_reader.py RENAMED
@@ -572,18 +572,16 @@ class AmorEventData(AmorHeader):
572
572
  def read_beam_monitor_stream(self, packets):
573
573
  if self._beam_monitor is None:
574
574
  return None
575
- _signal = self._beam_monitor.signal
576
- _time = self._beam_monitor.time
577
575
  plse = np.array([0, 5, 6, 11])
578
576
  base = np.array([2, 3, 8, 9])
579
- i = 0
580
- beam_monitor = np.recarray(shape=np.shape(packets.time)[0], dtype=BM_TYPE)
581
- for tt, tme in enumerate(_time):
582
- if (tme>=packets.time[0])&(tme<=packets.time[-1]):
583
- beam_monitor.value[i] = _signal[tt][plse].sum() - _signal[tt][base].sum()
584
- beam_monitor.time[i] = tme
585
- i += 1
586
- return beam_monitor[:i+1]
577
+ _time = self._beam_monitor.time
578
+ fltr = (self.eventStartTime<=_time)&(_time<=packets.time[-1])
579
+ _time = _time[fltr]
580
+ _signal = self._beam_monitor.signal[fltr]
581
+ beam_monitor = np.recarray(shape=_time.shape[0], dtype=BM_TYPE)
582
+ beam_monitor.time = _time
583
+ beam_monitor.value = _signal[:, plse].sum(axis=1) - _signal[:, base].sum(axis=1)
584
+ return beam_monitor
587
585
 
588
586
  def info(self):
589
587
  output = ""
{amor_eos-3.3.3 → amor_eos-3.3.4}/LICENSE RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/README.rst RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/__main__.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/command_line.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/compat.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/const.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/e2h.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/event_analysis.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/event_handling.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/header.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/helpers.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/helpers_numba.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/instrument.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/kafka_events.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/logconfig.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/ls.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/nicos.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/normalization.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/options.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/path_handling.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/projection.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/eos/reduction_e2h.py RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/pyproject.toml RENAMED
File without changes
{amor_eos-3.3.3 → amor_eos-3.3.4}/setup.cfg RENAMED
File without changes