Merge remote-tracking branch 'origin/bugfix/10705_BrokenDirectGUI'

mantidproject · Dec 15, 2014 · b79132c · b79132c
2 parents 77039e4 + 9269dd9
commit b79132c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/SystemTests/AnalysisTests/ISIS_LETReduction.py b/SystemTests/AnalysisTests/ISIS_LETReduction.py
@@ -146,7 +146,7 @@ def main(self,input_file=None,output_directory=None):
       red = DirectEnergyConversion();
 
       red.initialise(prop);
-      outWS = red.convert_to_energy_transfer(white_ws,sample_ws);
+      outWS = red.convert_to_energy(white_ws,sample_ws);
       #SaveNexus(ws,Filename = 'MARNewReduction.nxs')
 
       #when run from web service, return additional path for web server to copy data to";
@@ -284,7 +284,7 @@ def main(self,input_file=None,output_directory=None):
                 #MonoVanWSName = None;
 
                 # absolute unit reduction -- if you provided MonoVan run or relative units if monoVan is not present
-                out=red.convert_to_energy_transfer("wb_wksp","w1",energy,energybin,**argi)
+                out=red.convert_to_energy("wb_wksp","w1",energy,energybin,**argi)
 
                 ws_name = 'LETreducedEi{0:2.1f}'.format(energy);
                 RenameWorkspace(InputWorkspace=out,OutputWorkspace=ws_name);

diff --git a/SystemTests/AnalysisTests/ISIS_MAPS_DGSReduction.py b/SystemTests/AnalysisTests/ISIS_MAPS_DGSReduction.py
@@ -60,7 +60,7 @@ def main(self,input_file=None,output_directory=None):
 
        red = DirectEnergyConversion();
        red.initialise(self.iliad_prop);
-       outWS = red.convert_to_energy_transfer();
+       outWS = red.convert_to_energy();
        #SaveNexus(ws,Filename = 'MARNewReduction.nxs')
 
        #when run from web service, return additional path for web server to copy data to";

diff --git a/SystemTests/AnalysisTests/ISIS_MERLINReduction.py b/SystemTests/AnalysisTests/ISIS_MERLINReduction.py
@@ -47,7 +47,7 @@ def main(self,input_file=None,output_directory=None):
 
        red = DirectEnergyConversion();
        red.initialise(self.iliad_prop);
-       outWS = red.convert_to_energy_transfer();
+       outWS = red.convert_to_energy();
        #SaveNexus(ws,Filename = 'MARNewReduction.nxs')
 
        #when run from web service, return additional path for web server to copy data to";

diff --git a/SystemTests/AnalysisTests/ISIS_MariReduction.py b/SystemTests/AnalysisTests/ISIS_MariReduction.py
@@ -43,7 +43,7 @@ def main(self,input_file=None,output_directory=None):
 
        red = DirectEnergyConversion();
        red.initialise(self.iliad_prop);
-       outWS = red.convert_to_energy_transfer();
+       outWS = red.convert_to_energy();
        #SaveNexus(ws,Filename = 'MARNewReduction.nxs')
 
        #when run from web service, return additional path for web server to copy data to";
@@ -105,7 +105,7 @@ def main(self,input_file=None,output_directory=None):
 
        red = DirectEnergyConversion();
        red.initialise(self.iliad_prop);
-       outWS = red.convert_to_energy_transfer();
+       outWS = red.convert_to_energy();
        #SaveNexus(ws,Filename = 'MARNewReduction.nxs')
 
        #when run from web service, return additional path for web server to copy data to";
@@ -168,7 +168,7 @@ def main(self,input_file=None,output_directory=None):
 
        red = DirectEnergyConversion();
        red.initialise(self.iliad_prop);
-       outWS = red.convert_to_energy_transfer();
+       outWS = red.convert_to_energy();
        #SaveNexus(ws,Filename = 'MARNewReduction.nxs')
        #SaveNXSPE(outWS,'MAR_reduction2.nxspe')
 
@@ -216,7 +216,7 @@ def main(self,input_file=None,output_directory=None):
 
        red = DirectEnergyConversion();
        red.initialise(self.iliad_prop);
-       outWS = red.convert_to_energy_transfer();
+       outWS = red.convert_to_energy();
        #SaveNexus(ws,Filename = 'MARNewReduction.nxs')
 
        #when run from web service, return additional path for web server to copy data to";