Skip to content
Snippets Groups Projects
Commit b4a97380 authored by Sam Jenkins's avatar Sam Jenkins
Browse files

Re #23149 Made Flake edits

parent ce36b79e
No related branches found
No related tags found
No related merge requests found
...@@ -55,8 +55,7 @@ def _focus_one_ws(input_workspace, run_number, instrument, perform_vanadium_norm ...@@ -55,8 +55,7 @@ def _focus_one_ws(input_workspace, run_number, instrument, perform_vanadium_norm
focused_ws = mantid.DiffractionFocussing(InputWorkspace=aligned_ws, focused_ws = mantid.DiffractionFocussing(InputWorkspace=aligned_ws,
GroupingFileName=run_details.grouping_file_path) GroupingFileName=run_details.grouping_file_path)
calibrated_spectra = _apply_vanadium_corrections(instrument=instrument, run_number=run_number, calibrated_spectra = _apply_vanadium_corrections(input_workspace=focused_ws,
input_workspace=focused_ws,
perform_vanadium_norm=perform_vanadium_norm, perform_vanadium_norm=perform_vanadium_norm,
vanadium_splines=vanadium_path) vanadium_splines=vanadium_path)
...@@ -83,14 +82,13 @@ def _focus_one_ws(input_workspace, run_number, instrument, perform_vanadium_norm ...@@ -83,14 +82,13 @@ def _focus_one_ws(input_workspace, run_number, instrument, perform_vanadium_norm
return d_spacing_group return d_spacing_group
def _apply_vanadium_corrections(instrument, run_number, input_workspace, perform_vanadium_norm, vanadium_splines): def _apply_vanadium_corrections(input_workspace, perform_vanadium_norm, vanadium_splines):
run_details = instrument._get_run_details(run_number_string=run_number)
input_workspace = mantid.ConvertUnits(InputWorkspace=input_workspace, OutputWorkspace=input_workspace, Target="TOF") input_workspace = mantid.ConvertUnits(InputWorkspace=input_workspace, OutputWorkspace=input_workspace, Target="TOF")
split_data_spectra = common.extract_ws_spectra(input_workspace) split_data_spectra = common.extract_ws_spectra(input_workspace)
if perform_vanadium_norm: if perform_vanadium_norm:
processed_spectra = _divide_by_vanadium_splines(spectra_list=split_data_spectra, processed_spectra = _divide_by_vanadium_splines(spectra_list=split_data_spectra,
vanadium_splines=vanadium_splines) vanadium_splines=vanadium_splines)
else: else:
processed_spectra = split_data_spectra processed_spectra = split_data_spectra
...@@ -100,7 +98,6 @@ def _apply_vanadium_corrections(instrument, run_number, input_workspace, perform ...@@ -100,7 +98,6 @@ def _apply_vanadium_corrections(instrument, run_number, input_workspace, perform
def _batched_run_focusing(instrument, perform_vanadium_norm, run_number_string, absorb, sample_details): def _batched_run_focusing(instrument, perform_vanadium_norm, run_number_string, absorb, sample_details):
read_ws_list = common.load_current_normalised_ws_list(run_number_string=run_number_string, read_ws_list = common.load_current_normalised_ws_list(run_number_string=run_number_string,
instrument=instrument) instrument=instrument)
run_numbers = common.generate_run_numbers(run_number_string=run_number_string)
run_details = instrument._get_run_details(run_number_string=run_number_string) run_details = instrument._get_run_details(run_number_string=run_number_string)
vanadium_splines = mantid.LoadNexus(Filename=run_details.splined_vanadium_file_path) vanadium_splines = mantid.LoadNexus(Filename=run_details.splined_vanadium_file_path)
output = None output = None
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment