Allow expanding the wavelength range in events2histogram
Some checks failed
Release / build-ubuntu-latest (push) Failing after 2s
Release / build-windows (push) Has been cancelled
Release / release (push) Has been cancelled

This commit is contained in:
2025-11-04 15:03:00 +01:00
parent dfb5aa319f
commit fbced41b9f
5 changed files with 20 additions and 8 deletions

View File

@@ -2,5 +2,5 @@
Package to handle data redction at AMOR instrument to be used by __main__.py script.
"""
__version__ = '3.0.4'
__version__ = '3.0.5'
__date__ = '2025-11-04'

View File

@@ -25,8 +25,15 @@ class ExtractWalltime(EventDataAction):
dataset.data.events = new_events
class MergeFrames(EventDataAction):
def __init__(self, lamdaCut=None):
self.lamdaCut=lamdaCut
def perform_action(self, dataset: EventDatasetProtocol)->None:
tofCut = const.lamdaCut*dataset.geometry.chopperDetectorDistance/const.hdm*1e-13
if self.lamdaCut is None:
lamdaCut = const.lamdaCut
else:
lamdaCut = self.lamdaCut
tofCut = lamdaCut*dataset.geometry.chopperDetectorDistance/const.hdm*1e-13
total_offset = (tofCut +
dataset.timing.tau * (dataset.timing.ch1TriggerPhase + dataset.timing.chopperPhase/2)/180)
dataset.data.events.tof = merge_frames(dataset.data.events.tof, tofCut, dataset.timing.tau, total_offset)

View File

@@ -65,9 +65,14 @@ class LZGrid:
def qzRange(self):
return self._qzRange
def __init__(self, qResolution, qzRange):
def __init__(self, qResolution, qzRange, lambda_overwrite=None):
self._qResolution = qResolution
self._qzRange = qzRange
if lambda_overwrite is None:
self.lamdaMax = const.lamdaMax
self.lamdaCut = const.lamdaCut
else:
self.lamdaCut, self.lamdaMax = lambda_overwrite
@property
@cache
@@ -92,8 +97,8 @@ class LZGrid:
@cache
def lamda(self):
lamdaMax = 16
lamdaMin = const.lamdaCut
lamdaMax = self.lamdaMax
lamdaMin = self.lamdaCut
lamda_grid = lamdaMin*(1+self.dldl)**np.arange(int(np.log(lamdaMax/lamdaMin)/np.log(1+self.dldl)+1))
return lamda_grid

View File

@@ -298,7 +298,7 @@ class LZProjection(ProjectionInterface):
plt.colorbar(label='I / cpm')
plt.xlabel('$\\lambda$ / $\\AA$')
plt.ylabel('$\\Theta$ / °')
plt.xlim(3., 12.)
plt.xlim(self.lamda[0,0], self.lamda[-1,0])
af = self.alphaF[self.data.mask]
plt.ylim(af.min(), af.max())
plt.title('Wavelength vs. Reflection Angle')

View File

@@ -88,7 +88,7 @@ class E2HReduction:
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 or not self.config.experiment.is_default('lambdaRange'):
self.event_actions |= ea.MergeFrames()
self.event_actions |= ea.MergeFrames(lamdaCut=self.config.experiment.lambdaRange[0])
self.event_actions |= ea.AnalyzePixelIDs(self.config.experiment.yRange)
self.event_actions |= eh.TofTimeCorrection(self.config.experiment.incidentAngle==IncidentAngle.alphaF)
self.event_actions |= ea.CalculateWavelength(self.config.experiment.lambdaRange)
@@ -96,7 +96,7 @@ class E2HReduction:
# plot dependant options
if self.config.reduction.plot in [E2HPlotSelection.All, E2HPlotSelection.LT, E2HPlotSelection.Q]:
self.grid = LZGrid(0.05, [0.0, 0.25])
self.grid = LZGrid(0.05, [0.0, 0.25], lambda_overwrite=self.config.experiment.lambdaRange)
self.grid.dldl = 0.05
if self.config.reduction.plot in [E2HPlotSelection.All, E2HPlotSelection.Raw,