Skip to content
Snippets Groups Projects
Commit 55901927 authored by David Fairbrother's avatar David Fairbrother
Browse files

Re #19493 Added sample empty scaling for focusing

parent 42b816ba
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,8 @@ attr_mapping = \ ...@@ -20,6 +20,8 @@ attr_mapping = \
ParamMapEntry(ext_name="raw_data_cropping_values", int_name="raw_data_crop_values"), ParamMapEntry(ext_name="raw_data_cropping_values", int_name="raw_data_crop_values"),
ParamMapEntry(ext_name="run_in_range", int_name="run_in_range"), ParamMapEntry(ext_name="run_in_range", int_name="run_in_range"),
ParamMapEntry(ext_name="run_number", int_name="run_number"), ParamMapEntry(ext_name="run_number", int_name="run_number"),
ParamMapEntry(ext_name="sample_empty", int_name="sample_empty", optional=True),
ParamMapEntry(ext_name="sample_empty_scale", int_name="sample_empty_scale"),
ParamMapEntry(ext_name="spline_coefficient", int_name="spline_coeff"), ParamMapEntry(ext_name="spline_coefficient", int_name="spline_coeff"),
ParamMapEntry(ext_name="output_directory", int_name="output_dir"), ParamMapEntry(ext_name="output_directory", int_name="output_dir"),
ParamMapEntry(ext_name="user_name", int_name="user_name"), ParamMapEntry(ext_name="user_name", int_name="user_name"),
......
...@@ -27,8 +27,10 @@ def _focus_one_ws(ws, run_number, instrument, perform_vanadium_norm): ...@@ -27,8 +27,10 @@ def _focus_one_ws(ws, run_number, instrument, perform_vanadium_norm):
input_workspace = common.subtract_summed_runs(ws_to_correct=ws, instrument=instrument, input_workspace = common.subtract_summed_runs(ws_to_correct=ws, instrument=instrument,
empty_sample_ws_string=run_details.empty_runs) empty_sample_ws_string=run_details.empty_runs)
# Subtract a sample empty if specified # Subtract a sample empty if specified
input_workspace = common.subtract_summed_runs(ws_to_correct=input_workspace, instrument=instrument, if run_details.sample_empty:
empty_sample_ws_string=run_details.sample_empty) input_workspace = common.subtract_summed_runs(ws_to_correct=input_workspace, instrument=instrument,
empty_sample_ws_string=run_details.sample_empty,
scale_factor=instrument._inst_settings.sample_empty_scale)
# Crop to largest acceptable TOF range # Crop to largest acceptable TOF range
input_workspace = instrument._crop_raw_to_expected_tof_range(ws_to_crop=input_workspace) input_workspace = instrument._crop_raw_to_expected_tof_range(ws_to_crop=input_workspace)
......
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