From 72f5d842449cd40d548ebadcdffd77a84b0e48c8 Mon Sep 17 00:00:00 2001 From: GuiMacielPereira Date: Wed, 6 Nov 2024 15:23:32 +0000 Subject: [PATCH] Rename algorithm to VesuvioAnalysisRoutine Also corrected minor things, like removing unused import, removing unused variable and seting h ratio to zero by default. --- src/mvesuvio/analysis_reduction.py | 2 +- src/mvesuvio/analysis_routines.py | 11 +++++------ src/mvesuvio/config/analysis_inputs.py | 1 - tests/unit/analysis/test_analysis_reduction.py | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/mvesuvio/analysis_reduction.py b/src/mvesuvio/analysis_reduction.py index 6d580891..3e79743e 100644 --- a/src/mvesuvio/analysis_reduction.py +++ b/src/mvesuvio/analysis_reduction.py @@ -19,7 +19,7 @@ np.set_printoptions(suppress=True, precision=4, linewidth=200) -class AnalysisRoutine(PythonAlgorithm): +class VesuvioAnalysisRoutine(PythonAlgorithm): def summary(self): return "Runs the analysis reduction routine for VESUVIO." diff --git a/src/mvesuvio/analysis_routines.py b/src/mvesuvio/analysis_routines.py index f8b5f55e..899824ba 100644 --- a/src/mvesuvio/analysis_routines.py +++ b/src/mvesuvio/analysis_routines.py @@ -8,8 +8,7 @@ from mvesuvio.util.analysis_helpers import fix_profile_parameters, \ loadRawAndEmptyWsFromUserPath, cropAndMaskWorkspace, \ NeutronComptonProfile, calculate_h_ratio -from mvesuvio.analysis_reduction import AnalysisRoutine -from tests.testhelpers.calibration.algorithms import create_algorithm +from mvesuvio.analysis_reduction import VesuvioAnalysisRoutine def _create_analysis_object_from_current_interface(IC, running_tests=False): ws = loadRawAndEmptyWsFromUserPath( @@ -45,7 +44,7 @@ def _create_analysis_object_from_current_interface(IC, running_tests=False): "InputWorkspace": cropedWs.name(), "InputProfiles": profiles_table.name(), "InstrumentParametersFile": str(IC.InstrParsPath), - "HRatioToLowestMass": IC.HToMassIdxRatio, + "HRatioToLowestMass": IC.HToMassIdxRatio if hasattr(IC, 'HRatioToLowestMass') else 0, "NumberOfIterations": int(IC.noOfMSIterations), "InvalidDetectors": IC.maskedSpecAllNo.astype(int).tolist(), "MultipleScatteringCorrection": IC.MSCorrectionFlag, @@ -64,10 +63,10 @@ def _create_analysis_object_from_current_interface(IC, running_tests=False): } if running_tests: - alg = AnalysisRoutine() + alg = VesuvioAnalysisRoutine() else: - AlgorithmFactory.subscribe(AnalysisRoutine) - alg = AlgorithmManager.createUnmanaged("AnalysisRoutine") + AlgorithmFactory.subscribe(VesuvioAnalysisRoutine) + alg = AlgorithmManager.createUnmanaged("VesuvioAnalysisRoutine") alg.initialize() alg.setProperties(kwargs) diff --git a/src/mvesuvio/config/analysis_inputs.py b/src/mvesuvio/config/analysis_inputs.py index 6d9a26b6..9f46aaf1 100644 --- a/src/mvesuvio/config/analysis_inputs.py +++ b/src/mvesuvio/config/analysis_inputs.py @@ -43,7 +43,6 @@ def __init__(self, ipFilesPath): self.InstrParsPath = ipFilesPath / "ip2018_3.par" HToMassIdxRatio = 19.0620008206 # Set to zero or None when H is not present - massIdx = 0 # Masses, instrument parameters and initial fitting parameters masses = np.array([12, 16, 27]) diff --git a/tests/unit/analysis/test_analysis_reduction.py b/tests/unit/analysis/test_analysis_reduction.py index 1fd66f79..57d55b2a 100644 --- a/tests/unit/analysis/test_analysis_reduction.py +++ b/tests/unit/analysis/test_analysis_reduction.py @@ -2,7 +2,7 @@ import numpy as np import numpy.testing as nptest from mock import MagicMock -from mvesuvio.analysis_reduction import AnalysisRoutine +from mvesuvio.analysis_reduction import VesuvioAnalysisRoutine from mantid.simpleapi import CreateWorkspace, DeleteWorkspace import inspect