diff --git a/scripts/Diffraction/isis_powder/polaris.py b/scripts/Diffraction/isis_powder/polaris.py index 0dfd83cb460e32aed14e7d11b39d829c154e9662..f0e5c729912218243a66a360540a1cece63cb741 100644 --- a/scripts/Diffraction/isis_powder/polaris.py +++ b/scripts/Diffraction/isis_powder/polaris.py @@ -64,7 +64,7 @@ class Polaris(AbstractInst): q_lims=self._inst_settings.q_lims, cal_file_name=cal_file_name, sample_details=self._sample_details, - output_binning=self._inst_settings.output_binning, + delta_r=self._inst_settings.delta_r, pdf_type=self._inst_settings.pdf_type, freq_params=self._inst_settings.freq_params) return pdf_output diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py index f8c015e93bde19eac665389bf7457391b6a15954..34226e8d06393487015c85f7bc7042fd269cb580 100644 --- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py +++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py @@ -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, output_binning=None, pdf_type="G(r)", freq_params=None): + sample_details=None, delta_r=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') @@ -112,20 +112,13 @@ def generate_ts_pdf(run_number, focus_file_path, merge_banks=False, q_lims=None, CalculateScale=False) fast_fourier_filter(merged_ws, freq_params) pdf_output = mantid.PDFFourierTransform(Inputworkspace="merged_ws", InputSofQType="S(Q)-1", PDFType=pdf_type, - Filter=True) + Filter=True, DeltaR=delta_r) else: for ws in focused_ws: fast_fourier_filter(ws, freq_params) - pdf_output = mantid.PDFFourierTransform(Inputworkspace='focused_ws', InputSofQType="S(Q)-1", - PDFType=pdf_type, Filter=True) - pdf_output = mantid.RebinToWorkspace(WorkspaceToRebin=pdf_output, WorkspaceToMatch=pdf_output[4], - PreserveEvents=True) + pdf_output = mantid.PDFFourierTransform(Inputworkspace='focused_ws', InputSofQType="S(Q)-1", PDFType=pdf_type, + Filter=True, DeltaR=delta_r) common.remove_intermediate_workspace('self_scattering_correction') - if output_binning is not None: - try: - pdf_output = mantid.Rebin(InputWorkspace=pdf_output, Params=output_binning) - except RuntimeError: - return pdf_output # Rename output ws if 'merged_ws' in locals(): mantid.RenameWorkspace(InputWorkspace=merged_ws, OutputWorkspace=run_number + '_merged_Q') diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py index cb2e721b2ec2bdcf8efbe1080759e62afe45e7ca..40890a20c47510b8ce5104ae478cb6626b030908 100644 --- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py +++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py @@ -16,6 +16,7 @@ attr_mapping = [ ParamMapEntry(ext_name="calibration_directory", int_name="calibration_dir"), 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="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), @@ -37,7 +38,6 @@ attr_mapping = [ ParamMapEntry(ext_name="sample_empty_scale", int_name="sample_empty_scale"), ParamMapEntry(ext_name="suffix", int_name="suffix", optional=True), ParamMapEntry(ext_name="spline_coefficient", int_name="spline_coeff"), - ParamMapEntry(ext_name="output_binning", int_name="output_binning", optional=True), ParamMapEntry(ext_name="output_directory", int_name="output_dir"), ParamMapEntry(ext_name="user_name", int_name="user_name"), ParamMapEntry(ext_name="vanadium_cropping_values", int_name="van_crop_values"),