Skip to content
Snippets Groups Projects
Commit f12e5f28 authored by Harriet Brown's avatar Harriet Brown
Browse files

Add rebinning option for focused workspaces in polaris create pdf

This commit adds an option to rebin the focused/merged workspace with a delta_q paramiter in polaris create pdf.

re: #28415
parent 2a5d965e
No related branches found
No related tags found
No related merge requests found
......@@ -65,6 +65,7 @@ class Polaris(AbstractInst):
cal_file_name=cal_file_name,
sample_details=self._sample_details,
delta_r=self._inst_settings.delta_r,
delta_q=self._inst_settings.delta_q,
pdf_type=self._inst_settings.pdf_type,
freq_params=self._inst_settings.freq_params)
return pdf_output
......
......@@ -83,7 +83,7 @@ def save_unsplined_vanadium(vanadium_ws, output_path):
def generate_ts_pdf(run_number, focus_file_path, merge_banks=False, q_lims=None, cal_file_name=None,
sample_details=None, delta_r=None, pdf_type="G(r)", freq_params=None):
sample_details=None, delta_r=None, delta_q=None, pdf_type="G(r)", freq_params=None):
focused_ws = _obtain_focused_run(run_number, focus_file_path)
focused_ws = mantid.ConvertUnits(InputWorkspace=focused_ws, Target="MomentumTransfer", EMode='Elastic')
......@@ -105,7 +105,8 @@ def generate_ts_pdf(run_number, focus_file_path, merge_banks=False, q_lims=None,
self_scattering_correction = mantid.RebinToWorkspace(WorkspaceToRebin=self_scattering_correction,
WorkspaceToMatch=focused_ws)
focused_ws = mantid.Subtract(LHSWorkspace=focused_ws, RHSWorkspace=self_scattering_correction)
if delta_q:
focused_ws = mantid.Rebin(InputWorkspace=focused_ws, Params=delta_q)
if merge_banks:
q_min, q_max = _load_qlims(q_lims)
merged_ws = mantid.MatchAndMergeWorkspaces(InputWorkspaces=focused_ws, XMin=q_min, XMax=q_max,
......
......@@ -17,6 +17,7 @@ attr_mapping = [
ParamMapEntry(ext_name="calibration_mapping_file", int_name="cal_mapping_path"),
ParamMapEntry(ext_name="config_file", int_name="config_file"),
ParamMapEntry(ext_name="delta_r", int_name="delta_r", optional=True),
ParamMapEntry(ext_name="delta_q", int_name="delta_q", optional=True),
ParamMapEntry(ext_name="do_absorb_corrections", int_name="do_absorb_corrections"),
ParamMapEntry(ext_name="do_van_normalisation", int_name="do_van_normalisation"),
ParamMapEntry(ext_name="file_ext", int_name="file_extension", optional=True),
......
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