diff --git a/docs/source/release/v4.1.0/diffraction.rst b/docs/source/release/v4.1.0/diffraction.rst index 52da835a3370e9652e82e7a6861f65b488760032..f73a4926e2406238b158968b3d4d198d3deb1d76 100644 --- a/docs/source/release/v4.1.0/diffraction.rst +++ b/docs/source/release/v4.1.0/diffraction.rst @@ -39,6 +39,8 @@ Improvements - The Pearl scripts now crop to a dspacing of 8 on long-mode to avoid negative values caused by noise after this point. +- New example mapping files for GEM and POLARIS have been added to the ISIS powder scripts. + Bug Fixes ######### diff --git a/scripts/Diffraction/isis_powder/gem_routines/Examples/Gem_Mapping.yaml b/scripts/Diffraction/isis_powder/gem_routines/Examples/Gem_Mapping.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7e65933bc3c1a22c79e6ac478416fcfacce25005 --- /dev/null +++ b/scripts/Diffraction/isis_powder/gem_routines/Examples/Gem_Mapping.yaml @@ -0,0 +1,137 @@ +56207-57783: + label: "cycle_11_4" + offset_file_name: "offsets_2011_cycle111b.cal" + Rietveld: + vanadium_run_numbers: "56224" #V + empty_run_numbers: "56225" + +64300-66000: + label: "cycle_13_3" + offset_file_name: "offsets_2011_cycle111b.cal" + Rietveld: + vanadium_run_numbers: "64399" #VNb + empty_run_numbers: "64398" + +84213-84272: + label: "cycle_17_2_700MeV" + offset_file_name: "offsets_2011_cycle111b.cal" + Rietveld: +# vanadium_run_numbers: "84258" #V + vanadium_run_numbers: "84246" #VNb + empty_run_numbers: "84247" + + PDF: # none collected for 700MeV proton beam energy + vanadium_run_numbers: "83883" #VNb + empty_run_numbers: "83884" + + + +83881-84212: + label: "cycle_17_3" + offset_file_name: "offsets_2011_cycle111b.cal" + Rietveld: +# vanadium_run_numbers: "83882" #V + vanadium_run_numbers: "83883" #VNb + empty_run_numbers: "83884" + + PDF: + vanadium_run_numbers: "83883" #VNb + empty_run_numbers: "83884" + +84275-84312: + label: "cycle_17_4" + offset_file_name: "offsets_2011_cycle111b.cal" + Rietveld: +# vanadium_run_numbers: "83882" #V + vanadium_run_numbers: "84288" #VNb + empty_run_numbers: "84278" + + PDF: + vanadium_run_numbers: "83883" #VNb + empty_run_numbers: "83884" + +84313-85335: + label: "cycle_18_1" + offset_file_name: "offsets_2011_cycle111b.cal" + Rietveld: +# vanadium_run_numbers: "83882" #V +# vanadium_run_numbers: "84732" #VNb +#wk vanadium_run_numbers: "84697-84702" #VNb Methane tests, 110K +#wk empty_run_numbers: "84731" + vanadium_run_numbers: "85105" + empty_run_numbers: "85107" + +85336-86000: + label: "cycle_18_2" + offset_file_name: "offsets_2011_cycle111b.cal" + Rietveld: +#wk vanadium_run_numbers: "84732" #VNb +#wk empty_run_numbers: "85107" + vanadium_run_numbers: "85590" #VNb + empty_run_numbers: "85591" + +#86001-86093: + label: "cycle_18_2" + offset_file_name: "offsets_2011_cycle111b.cal" + Rietveld: +##wk vanadium_run_numbers: "84732" #VNb +##wk empty_run_numbers: "85107" + vanadium_run_numbers: "86017" #VNb + empty_run_numbers: "86018" + + + PDF: +# vanadium_run_numbers: "83883" #VNb +# empty_run_numbers: "83884" +# vanadium_run_numbers: "84856-84858" #VNb +# empty_run_numbers: "84859" +# vanadium_run_numbers: "85374" #VNb +# empty_run_numbers: "85359,85375" +# vanadium_run_numbers: "85710,85731,85734,85787,85822,85823,85828,85829,85910,85911" #VNb +# empty_run_numbers: "85711,85732,85824,85825,85832,85833,85912,85913" + vanadium_run_numbers: "85952" #VNb + empty_run_numbers: "85951" + +86095-86575: + label: "cycle_18_3" + offset_file_name: "offsets_2011_cycle111b.cal" + Rietveld: +##wk vanadium_run_numbers: "84732" #VNb +##wk empty_run_numbers: "85107" + vanadium_run_numbers: "86100" #VNb + empty_run_numbers: "86101" + + PDF: + vanadium_run_numbers: "86333,86344,86355" #VNb + empty_run_numbers: "86343,86354" + +86576-88000: + label: "cycle_18_4" + offset_file_name: "offsets_2011_cycle111b.cal" + Rietveld: + vanadium_run_numbers: "86576,86580" #VNb + empty_run_numbers: "86577" + + PDF: +# vanadium_run_numbers: "86581,86583,86584" #VNb +# empty_run_numbers: "86582,86585,86586" +# vanadium_run_numbers: "87154" #VNb +# empty_run_numbers: "87155" + vanadium_run_numbers: "87411" #VNb + empty_run_numbers: "87412" + +87567-90000: + label: "cycle_19_1" +# offset_file_name: "offsets_2011_cycle111b.cal" + offset_file_name: "offsets_2019_cycle191.cal" + Rietveld: + vanadium_run_numbers: "87568" #VNb + empty_run_numbers: "87569" + + PDF: +# vanadium_run_numbers: "86581,86583,86584" #VNb +# empty_run_numbers: "86582,86585,86586" +# vanadium_run_numbers: "87154" #VNb +# empty_run_numbers: "87155" + vanadium_run_numbers: "87573" #VNb + empty_run_numbers: "87574" diff --git a/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map.yaml b/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map.yaml new file mode 100644 index 0000000000000000000000000000000000000000..ef83a087cc2df7b200cf83a7bb4f99738a4886ea --- /dev/null +++ b/scripts/Diffraction/isis_powder/polaris_routines/Examples/polaris_cycle_map.yaml @@ -0,0 +1,157 @@ + +# NOTE: the data in the 8 lines below are TEST data - +# it is not representative of any actual cycles/data values used + +# Used in ISIS Powder tutorial +#98531-98534: +# # Calibration run +# offset_file_name : "cycle_16_5_silicon_all_spectra.cal" +# label : "17_1" +# Rietveld: +# vanadium_run_numbers : "98532" +# empty_run_numbers : "98531" + + +118851-: +# Note: Bank 5, Module 7, PMT Channel 17 u/s - not fixed +# : exclude s2674, s2682, s2685, s2686 = UDETs 507026, 507034, 507037, 507038 + offset_file_name : "cycle_19_1_silicon_all_spectra.cal" + label : "19_1" + Rietveld: + vanadium_run_numbers : "118863" + empty_run_numbers : "118862" + PDF: + vanadium_run_numbers : "118868" + empty_run_numbers : "118857-118858" + +114377-118850: +# Note: Bank 5, Module 7, PMT Channel 17 u/s - not fixed +# : exclude s2674, s2682, s2685, s2686 = UDETs 507026, 507034, 507037, 507038 + offset_file_name : "cycle_18_4_silicon_all_spectra.cal" + label : "18_4" + Rietveld: + vanadium_run_numbers : "114378" + empty_run_numbers : "114380" + PDF: + vanadium_run_numbers : "114400-114404" + empty_run_numbers : "114384-114388" + +113669-114376: + offset_file_name : "cycle_18_3_silicon_all_spectra.cal" + label : "18_3" + Rietveld: + vanadium_run_numbers : "113676" + empty_run_numbers : "113677" + PDF: + vanadium_run_numbers : "113684-113688" + empty_run_numbers : "113679-113683" + +112838-113668: + offset_file_name : "cycle_18_2_silicon_all_spectra.cal" + label : "18_2" + Rietveld: + vanadium_run_numbers : "112841" + empty_run_numbers : "112842" + PDF: + vanadium_run_numbers : "112845-112848" + empty_run_numbers : "112849-112854" + +109226-112837: +# Note: Files from BOTH Cycles 2018/1a AND 2018/1 will be saved to a +# single folder in the ISIS data archive (ISIS_cycle = "18_1") + offset_file_name : "cycle_18_1_silicon_all_spectra.cal" + label : "18_1" + Rietveld: + vanadium_run_numbers : "109228" + empty_run_numbers : "109229" + PDF: + vanadium_run_numbers : "109239-109247" + empty_run_numbers : "109234-109238" + +106851-109225: +# Note: Files from BOTH Cycles 2018/1a AND 2018/1 will be saved to a +# single folder in the ISIS data archive (ISIS_cycle = "18_1") + offset_file_name : "cycle_18_1a_silicon_all_spectra.cal" + label : "18_1a" + Rietveld: + vanadium_run_numbers : "106851" + empty_run_numbers : "106852" + PDF: + vanadium_run_numbers : "106911" + empty_run_numbers : "106910" + +102989-106850: + offset_file_name : "cycle_17_4_silicon_all_spectra.cal" + label : "17_4" + Rietveld: + vanadium_run_numbers : "102992" + empty_run_numbers : "102993" + PDF: + vanadium_run_numbers : "102998-103001" + empty_run_numbers : "103002-103005" + +100004-102988: + offset_file_name : "cycle_17_3_silicon_all_spectra.cal" + label : "17_3" + Rietveld: + vanadium_run_numbers : "100005" + empty_run_numbers : "100016" + PDF: + vanadium_run_numbers : "100022-100027" + empty_run_numbers : "100028-100033" + +99927-100003: + offset_file_name : "cycle_17_2_silicon_all_spectra.cal" + label : "17_2_700MeV" + Rietveld: + vanadium_run_numbers : "99953" + empty_run_numbers : "99954" + PDF: + vanadium_run_numbers : "99964-99969" + empty_run_numbers : "99970-99975" + +99154-99926: + offset_file_name : "cycle_17_2_silicon_all_spectra.cal" + label : "17_2" + Rietveld: + vanadium_run_numbers : "99156" + empty_run_numbers : "99155" + PDF: + vanadium_run_numbers : "99162" + empty_run_numbers : "99163" + +93000-99153: + offset_file_name : "cycle_17_1_silicon_all_spectra.cal" + label : "17_1" + Rietveld: + vanadium_run_numbers : "98532" + empty_run_numbers : "98531" + PDF: + vanadium_run_numbers : "98537" + empty_run_numbers : "98538" + +69963-73060: +# Note: run 73060 (last run in Journal Folder 14_1 is +# VANADIUM ROD run from start of Cycle 2014/2 + offset_file_name : "Cycle_14_1_silicon_all_spectra.cal" + label : "14_1" + Rietveld: + vanadium_run_numbers : "69963" + empty_run_numbers : "69967" +# PDF: +# vanadium_run_numbers : "" +# empty_run_numbers : "" + +63761-64299: + offset_file_name : "Cycle_12_2_group_masked_collimator.cal" + label : "13_2" + Rietveld: + vanadium_run_numbers : "63763" + empty_run_numbers : "63764" +# PDF: +# vanadium_run_numbers : "" +# empty_run_numbers : "" + + + + \ No newline at end of file