refs #6667 MARI and MAPS system tests pass

modified system tests, compared against vanadium
mantidproject · Jul 5, 2013 · 1933b51 · 1933b51
1 parent 884e2ba
commit 1933b51
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Code/Mantid/instrument/MARI_Parameters.xml b/Code/Mantid/instrument/MARI_Parameters.xml
@@ -32,7 +32,7 @@
 <!-- The map file used when calculating absolute units conversion integrals 
      This map usually groups together large areas of detectors to obtain proper vanadium statistics  -->
 <parameter name="monovan_mapfile" type="string">
-   <value val="mari_res"/>
+   <value val="mari_res2012"/>
 </parameter>
 
 

diff --git a/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py
@@ -398,14 +398,15 @@ def _do_mono(self, data_ws, monitor_ws, result_name, ei_guess,
             else:
                 self.log('_do_mono: Raw file detector header is superceeded') 
                 if self.relocate_dets: 
-                    self.log('_do_mono: Moving detectors to positions specified in cal file ')
+                    self.log('_do_mono: Moving detectors to positions specified in cal file ','debug')
                     if str(self.det_cal_file) in mtd: # it is already workspace 
                         self.__det_cal_file_ws = self.det_cal_file
 
                     if self.__det_cal_file_ws == None :
-                        self.log('_do_mono: Loading detector info from file ' + self.det_cal_file,'debug')                    
-                        LoadDetectorInfo(Workspace=result_name,DataFilename=self.det_cal_file,RelocateDets= self.relocate_dets)
-                        self.log('_do_mono: Loading detector info completed ')                                            
+                        self.log('_do_mono: Loading detector info from file ' +str(self.det_cal_file),'debug')    
+                        file = common.find_file(self.det_cal_file)
+                        LoadDetectorInfo(Workspace=result_name,DataFilename=file,RelocateDets= self.relocate_dets)
+                        self.log('_do_mono: Loading detector info completed ','debug')                                            
                     else:
                         self.log('_do_mono: Copying detectors positions from det_cal_file workspace: '+self.__det_cal_file_ws.name())                    
                         CopyInstrumentParameters(InputWorkspace=self.__det_cal_file_ws,OutputWorkspace=result_name)

diff --git a/Code/Mantid/scripts/Inelastic/dgreduce.py b/Code/Mantid/scripts/Inelastic/dgreduce.py
@@ -662,7 +662,7 @@ def sum_files(accumulator, files):
 
 
     if type(files) == list:
-         tmp_suffix = '_plus_tmp'
+         #tmp_suffix = '_plus_tmp'
 
          for filename in files:
               print 'Summing run ',filename,' to workspace ',accumulator