diff --git a/eos/file_reader.py b/eos/file_reader.py index 66b021e..53b57ec 100644 --- a/eos/file_reader.py +++ b/eos/file_reader.py @@ -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) diff --git a/eos/reduction_e2h.py b/eos/reduction_e2h.py index c7a2466..3fd76ed 100644 --- a/eos/reduction_e2h.py +++ b/eos/reduction_e2h.py @@ -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'): diff --git a/eos/reduction_reflectivity.py b/eos/reduction_reflectivity.py index 0a737dc..ba16e30 100644 --- a/eos/reduction_reflectivity.py +++ b/eos/reduction_reflectivity.py @@ -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: