amor-eos 3.2.8__tar.gz → 3.3.1__tar.gz

{amor_eos-3.2.8 → amor_eos-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amor_eos
-Version: 3.2.8
+Version: 3.3.1
 Summary: EOS reflectometry reduction for AMOR instrument
 Author: Jochen Stahn - Paul Scherrer Institut
 Author-email: jochen.stahn@psi.ch
@@ -16,6 +16,10 @@ Requires-Dist: numpy
 Requires-Dist: h5py
 Requires-Dist: orsopy
 Requires-Dist: numba
+Requires-Dist: matplotlib
+Requires-Dist: tabulate
+Requires-Dist: ess-streaming-data-types
+Requires-Dist: confluent-kafka
 Requires-Dist: backports.strenum; python_version < "3.11"
 Requires-Dist: backports.zoneinfo; python_version < "3.9"
 Dynamic: license-file

{amor_eos-3.2.8 → amor_eos-3.3.1}/amor_eos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amor_eos
-Version: 3.2.8
+Version: 3.3.1
 Summary: EOS reflectometry reduction for AMOR instrument
 Author: Jochen Stahn - Paul Scherrer Institut
 Author-email: jochen.stahn@psi.ch
@@ -16,6 +16,10 @@ Requires-Dist: numpy
 Requires-Dist: h5py
 Requires-Dist: orsopy
 Requires-Dist: numba
+Requires-Dist: matplotlib
+Requires-Dist: tabulate
+Requires-Dist: ess-streaming-data-types
+Requires-Dist: confluent-kafka
 Requires-Dist: backports.strenum; python_version < "3.11"
 Requires-Dist: backports.zoneinfo; python_version < "3.9"
 Dynamic: license-file

{amor_eos-3.2.8 → amor_eos-3.3.1}/amor_eos.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ amor_eos.egg-info/top_level.txt
 eos/__init__.py
 eos/__main__.py
 eos/command_line.py
+eos/compat.py
 eos/const.py
 eos/e2h.py
 eos/event_analysis.py

{amor_eos-3.2.8 → amor_eos-3.3.1}/amor_eos.egg-info/requires.txt

@@ -2,6 +2,10 @@ numpy
 h5py
 orsopy
 numba
+matplotlib
+tabulate
+ess-streaming-data-types
+confluent-kafka
 
 [:python_version < "3.11"]
 backports.strenum

{amor_eos-3.2.8 → amor_eos-3.3.1}/eos/__init__.py

@@ -2,5 +2,5 @@
 Package to handle data redction at AMOR instrument to be used by __main__.py script.
 """
 
-__version__ = '3.2.8'
-__date__    = '2026-03-18'
+__version__ = '3.3.1'
+__date__    = '2026-07-09'

amor_eos-3.3.1/eos/compat.py

@@ -0,0 +1,44 @@
+"""
+Presever compatibility with previous versions of AMOR datafiles.
+"""
+
+from datetime import datetime
+
+# old hdf parameter mappings, key is last date of validity
+legacy_hdf_paths = {
+        datetime(2026, 3, 18).timestamp():
+        dict(
+        title=('entry1/title', str),
+        proposal_id=('entry1/proposal_id', str),
+        user_name=('entry1/user/name', str),
+        user_email=('entry1/user/email', str),
+        sample_name=('entry1/sample/name', str),
+        source_name=('entry1/Amor/source/name', str),
+        sample_model=('entry1/sample/model', str),
+        start_time=('entry1/start_time', str),
+        start_time_fallback=('entry1/Amor/instrument_control_parameters/start_time', str),
+
+        chopper_separation=('entry1/Amor/chopper/pair_separation', float),
+        detector_distance=('entry1/Amor/detector/transformation/distance', float),
+        chopper_distance=('entry1/Amor/chopper/distance', float),
+        sample_temperature=('entry1/sample/temperature', float),
+        sample_magnetic_field=('entry1/sample/magnetic_field', float),
+
+        mu=('entry1/Amor/instrument_control_parameters/mu', float, 'mu'),
+        nu=('entry1/Amor/instrument_control_parameters/nu', float, 'nu'),
+        kap=('entry1/Amor/instrument_control_parameters/kappa', float, 'kappa'),
+        kad=('entry1/Amor/instrument_control_parameters/kappa_offset', float, 'kappa_offset'),
+        div=('entry1/Amor/instrument_control_parameters/div', float, 'div'),
+        ch1_trigger_phase=('entry1/Amor/chopper/ch1_trigger_phase', float, 'ch1_trigger_phase'),
+        ch2_trigger_phase=('entry1/Amor/chopper/ch2_trigger_phase', float, 'ch2_trigger_phase'),
+        chopper_speed=('entry1/Amor/chopper/rotation_speed', float, 'chopper_phase'),
+        chopper_phase=('entry1/Amor/chopper/phase', float, 'chopper_phase'),
+        polarization_config_label=('entry1/Amor/polarization/configuration', int, 'polarization_config_label', '/*'),
+
+        data=('entry1/Amor/detector/data', None),  # data group used to load events from
+        trigger=('entry1/Amor/chopper/ch2_trigger', float),
+        proton_current=('entry1/Amor/detector/proton_current', None),
+        ),
+    }
+# create a sorted list of validity timestamps for quick comparison
+legacy_cutoffs = list(sorted(legacy_hdf_paths.keys()))

{amor_eos-3.2.8 → amor_eos-3.3.1}/eos/event_data_types.py

@@ -29,11 +29,17 @@ class AmorTiming:
     chopperPhase: float
     tau: float
 
+@dataclass
+class DA00EventBuffer:
+    signal: np.ndarray
+    time: np.ndarray
+
 # Structured datatypes used for event streams
 EVENT_TYPE = np.dtype([('tof', np.float64), ('pixelID', np.uint32), ('mask', np.int32)])
 PACKET_TYPE = np.dtype([('start_index', np.uint32), ('time', np.int64)])
 PULSE_TYPE = np.dtype([('time', np.int64), ('monitor', np.float32)])
 PC_TYPE = np.dtype([('current', np.float32), ('time', np.int64)])
+BM_TYPE = np.dtype([('value', np.int32), ('time', np.int64)])
 LOG_TYPE = np.dtype([('value', np.float32), ('time', np.int64)])
 
 # define the bitmask for individual event filters
@@ -63,6 +69,7 @@ class AmorEventStream:
     packets: np.recarray # PACKET_TYPE
     pulses: np.recarray  # PULSE_TYPE
     proton_current: np.recarray # PC_TYPE
+    beam_monitor: Optional[np.recarray] = None # BM_TYPE
     device_logs: Dict[str, np.recarray] = field(default_factory=dict) # LOG_TYPE
 
 class EventDatasetProtocol(Protocol):

{amor_eos-3.2.8 → amor_eos-3.3.1}/eos/event_handling.py

@@ -91,6 +91,16 @@ class AssociatePulseWithMonitor(EventDataAction):
                                                               * 2*dataset.timing.tau * 1e-3
         elif self.monitorType==MonitorType.time:
             dataset.data.pulses.monitor  = 2*dataset.timing.tau
+        elif self.monitorType==MonitorType.neutron_monitor:
+            if dataset.data.pulses.monitor is None:
+                logging.warning("    Neutron monitor was selected for normalization but not presend, "
+                                "falling back to proton current")
+                dataset.data.pulses.monitor = self.get_current_per_pulse(dataset.data.pulses.time,
+                                                                         dataset.data.proton_current.time,
+                                                                         dataset.data.proton_current.current) \
+                                              *2*dataset.timing.tau*1e-3
+            else:
+                dataset.data.pulses.monitor = dataset.data.beam_monitor.value / 1e4
         else:  # pulses
             dataset.data.pulses.monitor  = 1
 
@@ -184,21 +194,22 @@ class ApplyMask(EventDataAction):
             fltr = (d.events.mask & (~self.bitmask_filter)) == 0
             d.events = d.events[fltr]
         post_filter = d.events.shape[0]
-        logging.info(f'      number of events: total = {pre_filter:7d}, filtered = {post_filter:7d}')
+        logging.info(f'      number of events: total = {pre_filter:7d}, after filtering = {post_filter:7d}')
         if d.device_logs == {} or not hasattr(dataset, 'update_info_from_logs'):
             return
-        # filter pulses and logs to allow update of header information
-        from .helpers import add_log_to_pulses
-        times = np.unique(d.events.wallTime)
-        # make sure all log variables are associated with pulses
-        for key, log in d.device_logs.items():
-            if not key in d.pulses.dtype.names:
-                # interpolate the parameter values for all existing pulses
-                add_log_to_pulses(key, dataset)
-        # remove all pulses that have no more events
-        d.pulses = d.pulses[np.isin(d.pulses.time, times)]
-        for key, log in d.device_logs.items():
-            d.device_logs[key] = np.recarray(d.pulses.shape, dtype = log.dtype)
-            d.device_logs[key].time = d.pulses.time
-            d.device_logs[key].value = d.pulses[key]
-        dataset.update_info_from_logs()
+        if 'wallTime' in d.events.dtype.names:
+            # filter pulses and logs to allow update of header information
+            from .helpers import add_log_to_pulses
+            times = np.unique(d.events.wallTime)
+            # make sure all log variables are associated with pulses
+            for key, log in d.device_logs.items():
+                if not key in d.pulses.dtype.names:
+                    # interpolate the parameter values for all existing pulses
+                    add_log_to_pulses(key, dataset)
+            # remove all pulses that have no more events
+            d.pulses = d.pulses[np.isin(d.pulses.time, times)]
+            for key, log in d.device_logs.items():
+                d.device_logs[key] = np.recarray(d.pulses.shape, dtype = log.dtype)
+                d.device_logs[key].time = d.pulses.time
+                d.device_logs[key].value = d.pulses[key]
+            dataset.update_info_from_logs()