Add using default workspace names

Author: RebeccaBecky

NDXINTER/reduce.py

@@ -1,5 +1,13 @@
 import sys
 
+sys.path.append('/opt/Mantid/scripts')
+sys.path.append('/opt/Mantid/scripts/SANS')
+sys.path.append('/opt/Mantid/lib')
+sys.path.append('/opt/Mantid/scripts/Inelastic')
+sys.path.append('/opt/Mantid/scripts/Engineering')
+sys.path.append('/opt/Mantid/scripts/Interface')
+sys.path.append('/opt/Mantid/scripts/Diffraction')
+
 AUTOREDUCTION_DIR = r"/autoreduce/data-archive/NDXINTER/user/scripts/autoreduction"
 sys.path.append(AUTOREDUCTION_DIR)
 
@@ -13,20 +21,36 @@
 def main(input_file, output_dir):
     standard_params = web_var.standard_vars
     advanced_params = web_var.advanced_vars
-    
     config['defaultsave.directory'] = output_dir
-    
-    OutputWorkspaceBinned, OutputWorkspace, OutputWorkspaceFirstTransmission, OutputWorkspaceSecondTransmission = ReflectometryISISLoadAndProcess(InputRunList=input_file,
-                                                        FirstTransmissionRunList=standard_params['first_transmission_run_list'],
-                                                        SecondTransmissionRunList=standard_params['second_transmission_run_list'],
-                                                        ThetaIn=standard_params['theta_in'],
-                                                        DetectorCorrectionType=standard_params['detector_correction_type'],
-                                                        AnalysisMode=standard_params['analysis_mode'],
-                                                        TransmissionProcessingInstructions=standard_params['transmission_processing_instructions'],
-                                                        ProcessingInstructions=standard_params['processing_instructions'])
-    
-    SaveNexus(OutputWorkspaceBinned, os.path.join(output_dir, OutputWorkspaceBinned.name()+".nxs"))
-    SaveNexus(OutputWorkspace, os.path.join(output_dir, OutputWorkspace.name()+".nxs"))
+
+    alg=AlgorithmManager.create("ReflectometryISISLoadAndProcess")
+    properties = {
+    "InputRunList" : standard_params['input_run_list'],
+    "FirstTransmissionRunList" : standard_params['first_transmission_run_list'],
+    "SecondTransmissionRunList" : standard_params['second_transmission_run_list'],
+    "ThetaIn" : standard_params['theta_in'],
+    "DetectorCorrectionType" : standard_params['detector_correction_type'],
+    "MonitorBackgroundWavelengthMin" : standard_params['monitor_background_wavelength_min'],
+    "MonitorBackgroundWavelengthMax" : standard_params['monitor_background_wavelength_max'],
+    "MonitorIntegrationWavelengthMin" : standard_params['MonitorIntegrationWavelengthMin'],
+    "MonitorIntegrationWavelengthMax" : standard_params['MonitorIntegrationWavelengthMax'],
+    "WavelengthMin" : standard_params['WavelengthMin'],
+    "WavelengthMax" : standard_params['WavelengthMax'],
+    "I0MonitorIndex" : standard_params['IZeroMonitorIndex'],
+    "AnalysisMode" : standard_params['analysis_mode'],
+    "StartOverlap" : standard_params['StartOverlap'],
+    "EndOverlap" : standard_params['EndOverlap'],
+    "TransmissionProcessingInstructions" : standard_params['transmission_processing_instructions'],
+    "ProcessingInstructions" : standard_params['processing_instructions']
+    }
+    alg.setProperties(properties)
+    alg.execute()
+
+    OutputWorkspace=alg.getPropertyValue("OutputWorkspace")
+    OutputWorkspaceBinned=alg.getPropertyValue("OutputWorkspaceBinned")
+
+    SaveNexus(OutputWorkspace, os.path.join(output_dir, OutputWorkspace+".nxs"))
+    SaveNexus(OutputWorkspaceBinned, os.path.join(output_dir, OutputWorkspaceBinned+".nxs"))
 
 if __name__ == "__main__":
     main('', '')

NDXINTER/reduce_vars.py

@@ -9,6 +9,13 @@
     'analysis_mode': "MultiDetectorAnalysis",
     'transmission_processing_instructions': "76-85",
     'processing_instructions': "80-84"
+    'MonitorIntegrationWavelengthMin' : 4.0,
+    'MonitorIntegrationWavelengthMax' : 10.0,
+    'WavelengthMin' : 1.5,
+    'WavelengthMax' : 17.0,
+    'StartOverlap' : 10.0,
+    'EndOverlap' : 12.0,
+    'IZeroMonitorIndex' : 2
 }
 advanced_vars = {
 }