diff --git a/docs/source/release/v3.12.0/diffraction.rst b/docs/source/release/v3.12.0/diffraction.rst index 6d4036d18fb5a63d69cd8159a833a485b19364a4..22b25adf5b353f43b56f219d7720488bae6d0126 100644 --- a/docs/source/release/v3.12.0/diffraction.rst +++ b/docs/source/release/v3.12.0/diffraction.rst @@ -18,6 +18,7 @@ Powder Diffraction - New algorithm :ref:`algm-EstimateDivergence` estimates the beam divergence due to finite slit size - :ref:`PDCalibration <algm-PDCalibration>` returns three more diagnostic workspaces: one for the fitted peak heights, one for the fitted peak widths, and one for observed resolution. - :ref:`LoadILLDiffraction <algm-LoadILLDiffraction>` now supports D2B files with calibrated data. +- ISIS Powder scripts for HRPD now support extra TOF windows 10-50 and 180-280 Engineering Diffraction ----------------------- diff --git a/docs/source/techniques/ISISPowder-HRPD-v1.rst b/docs/source/techniques/ISISPowder-HRPD-v1.rst index c65605e9daa7b318d9b6566d047f0915f5125ecd..2b67f08703c4d60b087702d0e143c31bc6197add 100644 --- a/docs/source/techniques/ISISPowder-HRPD-v1.rst +++ b/docs/source/techniques/ISISPowder-HRPD-v1.rst @@ -510,6 +510,13 @@ On HRPD this is set to the following: .. code-block:: python + # window = "10-50" + focused_cropping_values = [ + (1.2e4, 4.99e4), # Bank 1 + (1.2e4, 4.99e4), # Bank 2 + (1.2e4, 4.99e4), # Bank 3 + ] + # window = "10-110" focused_cropping_values = [ (1e4, 1.1e5), # Bank 1 @@ -530,7 +537,14 @@ On HRPD this is set to the following: (9.6e4, 2.18e5), # Bank 2 (1e5, 2.11e5) # Bank 3 ] - + + # window = "180-280" + focused_cropping_values = [ + (1.86e5, 2.8e5), # Bank 1 + (1.8e5, 2.798e5), # Bank 2 + (1.9e5, 2.795e5), # Bank 3 + ] + .. _grouping_file_name_hrpd_isis-powder-diffraction-ref: grouping_file_name @@ -589,6 +603,9 @@ On HRPD this is set to the following: .. code-block:: python + # window = "10-50" + vanadium_tof_cropping = (1.1e4, 5e4) + # window = "10-110" vanadium_tof_cropping = (1e4, 1.2e5) @@ -598,6 +615,9 @@ On HRPD this is set to the following: # window = "100-200" vanadium_tof_cropping = (1e5, 2.15e5) + # window = "180-280" + vanadium_tof_cropping = (1.8e5, 2.8e5) + Vanadium Sample details ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py index 28ef6070d26a3ddbd5d73c8d4970a314c76931a0..703c8e4354404a886ab124c4a7e41fb2ce369b72 100644 --- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py +++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_advanced_config.py @@ -11,12 +11,21 @@ absorption_correction_params = { # Default cropping values are 5% off each end +window_10_50_params = { + "vanadium_tof_cropping": (1.1e4, 5e4), + "focused_cropping_values": [ + (1.2e4, 4.99e4), # Bank 1 + (1.2e4, 4.99e4), # Bank 2 + (1.2e4, 4.99e4), # Bank 3 + ] +} + window_10_110_params = { "vanadium_tof_cropping": (1e4, 1.2e5), "focused_cropping_values": [ (1.5e4, 1.08e5), # Bank 1 (1.5e4, 1.12e5), # Bank 2 - (1.5e4, 1e5) # Bank 3 + (1.5e4, 1e5) # Bank 3 ] } @@ -38,6 +47,16 @@ window_100_200_params = { ] } + +window_180_280_params = { + "vanadium_tof_cropping": (1.8e5, 2.8e5), + "focused_cropping_values": [ + (1.86e5, 2.8e5), # Bank 1 + (1.8e5, 2.798e5), # Bank 2 + (1.9e5, 2.795e5), # Bank 3 + ] +} + file_names = { "grouping_file_name": "hrpd_new_072_01_corr.cal" } @@ -62,10 +81,14 @@ def get_all_adv_variables(tof_window=HRPD_TOF_WINDOWS.window_10_110): def get_tof_window_dict(tof_window): + if tof_window == HRPD_TOF_WINDOWS.window_10_50: + return window_10_50_params if tof_window == HRPD_TOF_WINDOWS.window_10_110: return window_10_110_params if tof_window == HRPD_TOF_WINDOWS.window_30_130: return window_30_130_params if tof_window == HRPD_TOF_WINDOWS.window_100_200: return window_100_200_params + if tof_window == HRPD_TOF_WINDOWS.window_180_280: + return window_180_280_params raise RuntimeError("Invalid time-of-flight window: {}".format(tof_window)) diff --git a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py index 57583772ac082c443c1604512e5836837f22b7e9..0c4e746e35c97ce6419d148ae83584bc5a8db3e6 100644 --- a/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py +++ b/scripts/Diffraction/isis_powder/hrpd_routines/hrpd_enums.py @@ -3,9 +3,11 @@ from __future__ import (absolute_import, division, print_function) class HRPD_TOF_WINDOWS(object): enum_friendly_name = "TOF windows" + window_10_50 = "10-50" window_10_110 = "10-110" window_30_130 = "30-130" window_100_200 = "100-200" + window_180_280 = "180-280" class HRPD_MODES(object):