Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

commit change for how time averaged data are pulled from logs #880

Merged
merged 1 commit into from
Oct 3, 2024
Merged

commit change for how time averaged data are pulled from logs #880

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions pyrs/core/nexus_conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Convert HB2B NeXus file to Hidra project file for further reduction
"""
import h5py
from mantid.api import Run
from mantid.kernel import Logger, BoolTimeSeriesProperty, FloatFilteredTimeSeriesProperty, FloatTimeSeriesProperty
from mantid.kernel import Int32TimeSeriesProperty, Int64TimeSeriesProperty, Int32FilteredTimeSeriesProperty
from mantid.kernel import Int64FilteredTimeSeriesProperty, StringTimeSeriesProperty, StringFilteredTimeSeriesProperty
Expand Down Expand Up @@ -57,7 +58,11 @@ def calculate_sub_run_time_average(log_property, time_filter) -> float:
if log_property.size() == 1: # single value property just copy
time_average_value = log_property.value
elif time_filter is None: # no filtering means use all values
time_average_value = log_property.timeAverageValue()
time_averaged_Run = Run()
time_averaged_Run.addProperty('filtered_log', log_property, False)
time_average_value = time_averaged_Run.getTimeAveragedValue(log_property.name)
del time_averaged_Run

else:
# filter and get time average value
if isinstance(log_property, FloatTimeSeriesProperty):
Expand All @@ -72,9 +77,11 @@ def calculate_sub_run_time_average(log_property, time_filter) -> float:
raise NotImplementedError('TSP log property {} of type {} is not supported'
''.format(log_property.name, type(log_property)))

time_average_value = filtered_tsp.timeAverageValue()
time_averaged_Run = Run()
time_averaged_Run.addProperty('filtered_log', filtered_tsp, False)
time_average_value = time_averaged_Run.getTimeAveragedValue(log_property.name)

del filtered_tsp
del filtered_tsp, time_averaged_Run

return time_average_value

Expand Down
Loading