Merge pull request #131 from mantidproject/update-calculate-gamma

Update gamma correction to use updated algorithm
mantidproject · Aug 30, 2024 · d28eb30 · d28eb30
2 parents 5f81684 + 91a4e81
commit d28eb30
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/src/mvesuvio/analysis_reduction.py b/src/mvesuvio/analysis_reduction.py
@@ -994,25 +994,9 @@ def create_gamma_workspaces(self):
 
         profiles = self.calcGammaCorrectionProfiles(self._mean_widths, self._mean_intensity_ratios)
 
-        # Approach below not currently suitable for current versions of Mantid, but will be in the future
-        # background, corrected = VesuvioCalculateGammaBackground(InputWorkspace=inputWS, ComptonFunction=profiles)
-        # DeleteWorkspace(corrected)
-        # RenameWorkspace(InputWorkspace= background, OutputWorkspace = inputWS+"_Gamma_Background")
-
-        ws = CloneWorkspace(InputWorkspace=inputWS, OutputWorkspace="tmpGC")
-        for spec in range(ws.getNumberHistograms()):
-            background, corrected = VesuvioCalculateGammaBackground(
-                InputWorkspace=inputWS, ComptonFunction=profiles, WorkspaceIndexList=spec
-            )
-            ws.dataY(spec)[:], ws.dataE(spec)[:] = (
-                background.dataY(0)[:],
-                background.dataE(0)[:],
-            )
-        DeleteWorkspace(background)
+        background, corrected = VesuvioCalculateGammaBackground(InputWorkspace=inputWS, ComptonFunction=profiles)
         DeleteWorkspace(corrected)
-        RenameWorkspace(
-            InputWorkspace="tmpGC", OutputWorkspace=inputWS + "_Gamma_Background"
-        )
+        RenameWorkspace(InputWorkspace= background, OutputWorkspace = inputWS + "_Gamma_Background")
 
         Scale(
             InputWorkspace=inputWS + "_Gamma_Background",