Skip to content

Commit

Permalink
Update gamma correction to use updated algorithm
Browse files Browse the repository at this point in the history
Mantid's algorithm for gamma correction was recently updated
to correct a bug where output workspaces would not preserve the
order of the spectra.

Now that this is fixed, we can avoid using a for loop for the gamma
correction algorithm.
  • Loading branch information
GuiMacielPereira committed Aug 28, 2024
1 parent 5f81684 commit c4b846d
Showing 1 changed file with 2 additions and 17 deletions.
19 changes: 2 additions & 17 deletions src/mvesuvio/analysis_reduction.py
Original file line number Diff line number Diff line change
Expand Up @@ -995,24 +995,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",
Expand Down

0 comments on commit c4b846d

Please sign in to comment.