From dfb5aa319fe0e9fb302a2eda386cf058cc583d4e Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Tue, 4 Nov 2025 14:24:25 +0100 Subject: [PATCH] Allow wavelength filtering for raw plots in events2histogram --- eos/__init__.py | 4 ++-- eos/reduction_e2h.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eos/__init__.py b/eos/__init__.py index 8a71f42..e24061e 100644 --- a/eos/__init__.py +++ b/eos/__init__.py @@ -2,5 +2,5 @@ Package to handle data redction at AMOR instrument to be used by __main__.py script. """ -__version__ = '3.0.3' -__date__ = '2025-10-28' +__version__ = '3.0.4' +__date__ = '2025-11-04' diff --git a/eos/reduction_e2h.py b/eos/reduction_e2h.py index 63a329f..d454d79 100644 --- a/eos/reduction_e2h.py +++ b/eos/reduction_e2h.py @@ -58,6 +58,9 @@ class E2HReduction: if self.config.reduction.plot==E2HPlotSelection.Raw: # Raw implies fast caculations self.config.reduction.fast = True + if not self.config.experiment.is_default('lambdaRange'): + # filtering wavelength requires frame analysis + self.config.reduction.fast = False if not self.config.reduction.fast or self.config.reduction.plot in NEEDS_LAMDA: from . import event_analysis as ea @@ -84,7 +87,7 @@ class E2HReduction: # perform corrections for tof if not fast mode self.event_actions |= eh.TofTimeCorrection(self.config.experiment.incidentAngle==IncidentAngle.alphaF) # select needed actions in depenence of plots - if self.config.reduction.plot in NEEDS_LAMDA: + if self.config.reduction.plot in NEEDS_LAMDA or not self.config.experiment.is_default('lambdaRange'): self.event_actions |= ea.MergeFrames() self.event_actions |= ea.AnalyzePixelIDs(self.config.experiment.yRange) self.event_actions |= eh.TofTimeCorrection(self.config.experiment.incidentAngle==IncidentAngle.alphaF)