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

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

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

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

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

{amor_eos-3.3.0 → 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.3.0'
+__version__ = '3.3.1'
 __date__    = '2026-07-09'

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

@@ -197,18 +197,19 @@ class ApplyMask(EventDataAction):
         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()

{amor_eos-3.3.0 → amor_eos-3.3.1}/eos/file_reader.py

@@ -63,7 +63,7 @@ class AmorHeader:
             nu=('entry1/measurement_configuration/nu', float, 'nu'),
             kap=('entry1/measurement_configuration/kappa', float, 'kappa'),
             kad=('entry1/measurement_configuration/kappa_offset', float, 'kappa_offset'),
-            div=('entry1/measurement_configuration/div', float, 'div'),
+            div=('entry1/measurement_configuration/divergence', float, 'div'),
             virtual_source_horizontal=('entry1/Amor/virtual_source/horizontal', float),
             virtual_source_vertical=('entry1/Amor/virtual_source/vertical', float),
             ch1_trigger_phase=('entry1/Amor/chopper/ch1_trigger_phase', float, 'ch1_trigger_phase'),

{amor_eos-3.3.0 → amor_eos-3.3.1}/eos/options.py

@@ -433,8 +433,8 @@ class ReflectivityReductionConfig(ArgParsable):
             metadata={
                 'group': 'input data',
                 'help': 'apply convolution on lambda axes to smooth the normalization data, useful for low statistics'})
-    scale: List[float] = field(
-            default_factory=lambda: [],
+    scale: Optional[List[float]] = field(
+            default=None,
             metadata={
                 'short': 's',
                 'group': 'data manicure',

{amor_eos-3.3.0 → amor_eos-3.3.1}/eos/reduction_e2h.py

@@ -131,11 +131,7 @@ class E2HReduction:
             # safe to image file if not auto-updating graph
             plt.savefig(f'e2h_{self.config.reduction.plot}.png', dpi=300)
         if self.config.reduction.kafka:
-            from .kafka_serializer import ESSSerializer
-            self.serializer = ESSSerializer()
-            self.fig.canvas.mpl_connect('close_event', self.serializer.end_command_thread)
-            self.serializer.start_command_thread()
-            self.serializer.send(self.projection)
+            raise RuntimeError("--kafka not implemented for events2histogram, use eos nicos script")
         if self.config.reduction.update:
             self.timer = self.fig.canvas.new_timer(1000)
             self.timer.add_callback(self.update)
@@ -313,6 +309,3 @@ class E2HReduction:
         self.projection.update_plot()
         plt.suptitle(self.create_title())
         plt.draw()
-
-        if self.config.reduction.kafka:
-            self.serializer.send(self.projection)

{amor_eos-3.3.0 → amor_eos-3.3.1}/eos/reduction_reflectivity.py

@@ -310,12 +310,12 @@ class ReflectivityReduction:
             logging.info(f'      {ti:<4d}  {time:6.0f}  {self.monitor:7.2f} {MONITOR_UNITS[self.config.experiment.monitorType]}')
 
             proj: LZProjection = self.project_on_lz(slice)
-            try:
-                scale = self.config.reduction.scale[i]
-            except IndexError:
-                scale = self.config.reduction.scale[-1]
-                # TODO: causes error if no '-s' argumnet is given
-            proj.scale(scale)
+            if not self.config.reduction.is_default('scale'):
+                try:
+                    scale = self.config.reduction.scale[i]
+                except IndexError:
+                    scale = self.config.reduction.scale[-1]
+                proj.scale(scale)
 
             # projection on qz-grid
             result = proj.project_on_qz()