diff --git a/total_scattering/file_handling/load.py b/total_scattering/file_handling/load.py index da742b2..c077d11 100644 --- a/total_scattering/file_handling/load.py +++ b/total_scattering/file_handling/load.py @@ -4,6 +4,7 @@ AlignAndFocusPowderFromFiles, \ ApplyDiffCal, \ ConvertUnits, \ + DeleteWorkspace, \ DiffractionFocussing, \ Divide, \ Load, \ @@ -268,6 +269,7 @@ def load(ws_name, input_files, group_wksp, Plus(LHSWorkspace=ws_name, RHSWorkspace="wksp_tmp_qrb", OutputWorkspace=ws_name) + DeleteWorkspace(Workspace="wksp_tmp_qrb") if absorption_wksp != '': ConvertUnits( diff --git a/total_scattering/reduction/total_scattering_reduction.py b/total_scattering/reduction/total_scattering_reduction.py index b55becc..a275bbe 100644 --- a/total_scattering/reduction/total_scattering_reduction.py +++ b/total_scattering/reduction/total_scattering_reduction.py @@ -564,7 +564,7 @@ def TotalScatteringReduction(config: dict = None): # Grouping grouping = merging.get('Grouping', None) - cache_dir = config.get("CacheDir", None) + cache_dir = config.get("CacheDirMTS", None) OutputDir = config.get("OutputDir", os.path.abspath('.')) manual_grouping = grouping if manual_grouping: @@ -976,8 +976,7 @@ def TotalScatteringReduction(config: dict = None): pe_tmp = gen_config.config_params["PreserveEvents"] alignAndFocusArgs['PreserveEvents'] = pe_tmp qparams = gen_config.config_params["QParamsProcessing"] - if cache_dir is not None: - alignAndFocusArgs['CacheDir'] = os.path.abspath(cache_dir) + # add resonance filter related properties # NOTE: # the default behaivor is no filtering if not specified.