Commit 8f549c94 authored by Mathieu Tillet's avatar Mathieu Tillet
Browse files

Change parameter name to ConvertToTOF

Because that seems to be the convention for parameter capitalization.
parent dbc79c36
......@@ -72,7 +72,7 @@ void LoadILLTOF2::init() {
declareProperty(std::make_unique<WorkspaceProperty<>>("OutputWorkspace", "",
Direction::Output),
"The name to use for the output workspace");
declareProperty("convertToTOF", false, Direction::Input);
declareProperty("ConvertToTOF", false, Direction::Input);
}
/**
......
......@@ -734,7 +734,7 @@ class DirectILLCollectData(DataProcessorAlgorithm):
if inputFiles:
mergedWSName = self._names.withSuffix('merged')
mainWS = LoadAndMerge(Filename=inputFiles, OutputWorkspace=mergedWSName,
LoaderName='LoadILLTOF', LoaderOptions={"convertToTOF": True}, EnableLogging=self._subalgLogging)
LoaderName='LoadILLTOF', LoaderOptions={"ConvertToTOF": True}, EnableLogging=self._subalgLogging)
else:
mainWS = self.getProperty(common.PROP_INPUT_WS).value
self._cleanup.protect(mainWS)
......
......@@ -210,9 +210,9 @@ class IN6(systemtesting.MantidSystemTest):
class IN5_Tube_Background(systemtesting.MantidSystemTest):
def runTest(self):
Load(Filename='ILL/IN5/Epp.nxs', OutputWorkspace='Epp', convertToTOF=True)
Load(Filename='ILL/IN5/Sample.nxs', OutputWorkspace='Sample', convertToTOF=True)
Load(Filename='ILL/IN5/Vmask.nxs', OutputWorkspace='Vmask', convertToTOF=True)
Load(Filename='ILL/IN5/Epp.nxs', OutputWorkspace='Epp', ConvertToTOF=True)
Load(Filename='ILL/IN5/Sample.nxs', OutputWorkspace='Sample', ConvertToTOF=True)
Load(Filename='ILL/IN5/Vmask.nxs', OutputWorkspace='Vmask', ConvertToTOF=True)
args = {'InputWorkspace':'Sample',
'DiagnosticsWorkspace':'Vmask',
'EPPWorkspace':'Epp',
......@@ -249,7 +249,7 @@ class IN5_Mask_Non_Overlapping_Bins(systemtesting.MantidSystemTest):
OutputEPPWorkspace='Epp'
)
ws = Load(run, convertToTOF=True)
ws = Load(run, ConvertToTOF=True)
self.ecrase(ws)
DirectILLCollectData(
......
......@@ -140,7 +140,7 @@ For usage of this algorithm as part of the direct geometry data reduction, check
# It is recommended to use DirectILLCollectData over the basic Load
preprocessed = DirectILLCollectData('ILL/IN4/087294+087295.nxs')
# Compare to simply loading the data
raw = Load('ILL/IN4/087294+087295.nxs', convertToTOF=true)
raw = Load('ILL/IN4/087294+087295.nxs', ConvertToTOF=true)
# The workspace loaded by 'Load' includes monitor data which
# makes 2D plotting difficult
nRaw = raw.getNumberHistograms()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment