3 Commits

Author SHA1 Message Date
8abd977656 release with -m functionality and better lambda resolution in e2h
Some checks failed
Release / build-ubuntu-latest (push) Failing after 2s
Release / build-windows (push) Has been cancelled
Release / release (push) Has been cancelled
2025-11-19 13:29:49 +01:00
432d85c9b3 release with -m functionality and better lambda resolution in e2h 2025-11-19 13:25:38 +01:00
c222f42a89 screen output format and -m/-mu included in e2h 2025-11-19 13:21:10 +01:00
5 changed files with 10 additions and 7 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.5'
__date__ = '2025-11-04'
__version__ = '3.0.6'
__date__ = '2025-11-05'

View File

@@ -223,7 +223,6 @@ class AmorEventData(AmorHeader):
def __init__(self, fileName:Union[str, h5py.File, BinaryIO], first_index:int=0, max_events:int=100_000_000):
if type(fileName) is str:
#logging.warning(f' opening file {fileName}')
logging.warning(f' {fileName.split("/")[-1]}')
self.file_list = [fileName]
hdf = h5py.File(fileName, 'r', swmr=True)

View File

@@ -51,6 +51,7 @@ class E2HReduction:
self.plot_kwds = {}
plt.rcParams.update({'font.size': self.config.reduction.fontsize})
self.overwrite = eh.ApplyParameterOverwrites(self.config.experiment) # some actions use instrument parameters, change before that
if self.config.reduction.update:
# live update implies plotting
self.config.reduction.show_plot = True
@@ -68,6 +69,7 @@ class E2HReduction:
# Actions on datasets not used for normalization
self.event_actions = eh.ApplyPhaseOffset(self.config.experiment.chopperPhaseOffset)
if not self.config.reduction.fast:
self.event_actions |= self.overwrite
self.event_actions |= eh.CorrectChopperPhase()
self.event_actions |= ea.ExtractWalltime()
else:
@@ -97,7 +99,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], lambda_overwrite=self.config.experiment.lambdaRange)
self.grid.dldl = 0.05
self.grid.dldl = 0.01
if self.config.reduction.plot in [E2HPlotSelection.All, E2HPlotSelection.Raw,
E2HPlotSelection.LT, E2HPlotSelection.YT,
@@ -151,6 +153,7 @@ class E2HReduction:
def prepare_graphs(self):
last_file_header = AmorHeader(self.file_list[-1])
self.overwrite.perform_action(last_file_header)
tthh = last_file_header.geometry.nu - last_file_header.geometry.mu
if not self.config.reduction.is_default('thetaRangeR'):

View File

@@ -117,7 +117,7 @@ class ReflectivityReduction:
plt.show()
def read_file_block(self, i, short_notation):
logging.warning('reading input:')
logging.warning('input:')
file_list = self.path_resolver.resolve(short_notation)
self.header.measurement_data_files = []
@@ -159,7 +159,7 @@ class ReflectivityReduction:
def analyze_unsliced(self, i):
self.monitor = self.dataset.data.pulses.monitor.sum()
logging.warning(f' monitor = {self.monitor:8.2f} {MONITOR_UNITS[self.config.experiment.monitorType]}')
logging.info(f' monitor = {self.monitor:8.2f} {MONITOR_UNITS[self.config.experiment.monitorType]}')
proj:LZProjection = self.project_on_lz()
try:

View File

@@ -37,6 +37,7 @@ hist_tofz = device('nicos_sinq.devices.just_bin_it.JustBinItImage',
```
These images have then to be set in the detector configuration as _images_ items:
```
images=['hist_yz', 'hist_tofz'],
```
```