Skip to content

Commit

Permalink
Merge pull request #854 from neutrons/tweak_live_reduce
Browse files Browse the repository at this point in the history
fix property search
  • Loading branch information
fanchercm authored Sep 11, 2023
2 parents ff4944a + 2768848 commit 7868f2d
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions pyrs/core/nexus_conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ def __load_logs(self, logs_to_keep):
if self._live_wsp is not None:
# setup workspace for event logs
self._event_wksp = CreateSampleWorkspace(OutputWorkspace='logs', WorkspaceType='Event', NumEvents=0,
InstrumentName='hb2b')
InstrumentName='hidra')

# add sample logs to a seperate workspace
CopyLogs(InputWorkspace=self._live_wsp, OutputWorkspace=self._event_wksp)
Expand Down Expand Up @@ -386,7 +386,7 @@ def __load_mask(self, mask_file_name):
mask_ws_name = os.path.basename(mask_file_name.split('.')[0])

try:
mask_ws = LoadMask(Instrument='hidra', InputFile=mask_file_name, RefWorkspace=self._event_wksp,
mask_ws = LoadMask(Instrument='hb2b', InputFile=mask_file_name,
OutputWorkspace=mask_ws_name)
except RuntimeError: # second mask load added for old data measured prior to instrument rename
mask_ws = LoadMask(Instrument='nrsf2', InputFile=mask_file_name, RefWorkspace=self._event_wksp,
Expand Down Expand Up @@ -424,7 +424,8 @@ def _generate_subrun_event_indices(self, pulse_time_array, event_index_array, nu

def get_events_time_wsp(self):
# Load: this h5 will be opened all the time
start_time = self._live_wsp.getRun().getProperty('start_time').value

start_time = self._live_wsp.getRun().getProperty('run_start').value
start_time = np.array(start_time, dtype='datetime64[ns]')

# Load: this h5 will be opened all the time
Expand Down

1 comment on commit 7868f2d

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitLab pipeline for pyrs-dev has been submitted for this commit: "https://code.ornl.gov/sns-hfir-scse/deployments/pyrs-deploy/-/pipelines/450594"

Please sign in to comment.