diff --git a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py index a3fa9121a8378898af8d6d15dbcab46395797783..8b1691134d19d728101a872bc411b2983c78b81d 100644 --- a/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py +++ b/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSSave.py @@ -127,7 +127,7 @@ class SANSSave(DataProcessorAlgorithm): # SaveNXcanSAS clashes with SaveNexusProcessed self.add_file_format_with_appended_name_requirement(file_formats, SaveType.NXcanSAS, file_types, - [SaveType.Nexus]) + []) # SaveNISTDAT clashes with SaveRKH, both can save to .dat self.add_file_format_with_appended_name_requirement(file_formats, SaveType.NistQxy, file_types, [SaveType.RKH]) diff --git a/Testing/SystemTests/tests/analysis/SANSSaveTest.py b/Testing/SystemTests/tests/analysis/SANSSaveTest.py index 8cfa862cac4ebd044997706f38a4a9491f404307..e553c244b8b06d9f3a8b6bec1d3be9c990fcb2f0 100644 --- a/Testing/SystemTests/tests/analysis/SANSSaveTest.py +++ b/Testing/SystemTests/tests/analysis/SANSSaveTest.py @@ -80,7 +80,7 @@ class SANSSaveTest(unittest.TestCase): # Assert expected_files = ["sample_sans_save_file.xml", "sample_sans_save_file.txt", "sample_sans_save_file_nistqxy.dat", - "sample_sans_save_file_nxcansas.nxs", "sample_sans_save_file.nxs", + "sample_sans_save_file.h5", "sample_sans_save_file.nxs", "sample_sans_save_file.csv"] expected_full_file_names = [os.path.join(mantid.config.getString('defaultsave.directory'), elem) for elem in expected_files] diff --git a/docs/source/release/v3.13.0/sans.rst b/docs/source/release/v3.13.0/sans.rst index 334281894d81507572d4bc453d3092d4b52f71d2..b5f40975a0053fbfe36cd116896193e23913850d 100644 --- a/docs/source/release/v3.13.0/sans.rst +++ b/docs/source/release/v3.13.0/sans.rst @@ -37,6 +37,7 @@ Improvements * Improved error messages in the new GUI to be more obvious and clearer. * Updated the naming of workspace groups in a sliced reduction. * Updated old backend to mask by detector ID rather than spectrum number, improving reliability. +* NXcanSAS is now saved out with a .h5 extension so it can be read into SASView. Bugfixes ######## diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui b/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui index c66860f6e5af37dda591a98e44ff6c0397b81507..39d87d57b2e467e80af34b80b926f5428086092d 100644 --- a/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui +++ b/scripts/Interface/ui/sans_isis/sans_data_processor_window.ui @@ -291,7 +291,7 @@ QGroupBox::title { <string>Memor&y</string> </property> <property name="checked"> - <bool>true</bool> + <bool>false</bool> </property> </widget> </item> @@ -313,6 +313,9 @@ QGroupBox::title { <property name="text"> <string>Both</string> </property> + <property name="checked"> + <bool>true</bool> + </property> </widget> </item> </layout> diff --git a/scripts/SANS/sans/algorithm_detail/save_workspace.py b/scripts/SANS/sans/algorithm_detail/save_workspace.py index 121df937ea1356df9c9a4d60ca5ad208e1930477..530462b3478776a1c03f84b8489213c6f666a455 100644 --- a/scripts/SANS/sans/algorithm_detail/save_workspace.py +++ b/scripts/SANS/sans/algorithm_detail/save_workspace.py @@ -43,7 +43,7 @@ def get_save_strategy(file_format_bundle, file_name, save_options): file_name = get_file_name(file_format_bundle, file_name, "", ".xml") save_name = "SaveCanSAS1D" elif file_format is SaveType.NXcanSAS: - file_name = get_file_name(file_format_bundle, file_name, "_nxcansas", ".nxs") + file_name = get_file_name(file_format_bundle, file_name, "_nxcansas", ".h5") save_name = "SaveNXcanSAS" elif file_format is SaveType.NistQxy: file_name = get_file_name(file_format_bundle, file_name, "_nistqxy", ".dat")