refs #9135 Modified LoadRaw to produce low case monitor workspace name

when monitors are loaded separately from the main workspace
mantidproject · Apr 8, 2014 · fc9b6c6 · fc9b6c6
1 parent 3293b2f
commit fc9b6c6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRaw3.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRaw3.cpp
@@ -228,7 +228,7 @@ namespace Mantid
       if(bseparateMonitors && normalwsSpecs == 0)
       {
         // Ensure we fill the correct group as if we are only loading monitors then we essentially want normal behavior
-        // with no extra _Monitors workspace
+        // with no extra _monitors workspace
         ws_grp = monitorws_grp;
       }
 

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp
@@ -266,7 +266,7 @@ namespace Mantid
         // otherwise  set the workspace as "OutputWorkspace"
         if (nwsSpecs> 0)
         {               
-          std::string monitorwsName = wsName + "_Monitors";
+          std::string monitorwsName = wsName + "_monitors";
           declareProperty(new WorkspaceProperty<Workspace> ("MonitorWorkspace", monitorwsName,
               Direction::Output));
           setWorkspaceProperty("MonitorWorkspace", title, mongrp_sptr, monws_sptr,numberOfPeriods, true);
@@ -318,7 +318,7 @@ namespace Mantid
       suffix << (period + 1);
       if (bmonitors)
       {
-        wsName = localWSName + "_Monitors" + "_" + suffix.str();
+        wsName = localWSName + "_monitors" + "_" + suffix.str();
         outputWorkspace = "MonitorWorkspace";
       }
       else

diff --git a/Code/Mantid/scripts/Inelastic/CommonFunctions.py b/Code/Mantid/scripts/Inelastic/CommonFunctions.py
@@ -135,13 +135,10 @@ def load_run(inst_name, run_number, calibration=None, force=False):
         wrong_monitors_name = False;
         if ext.endswith("raw"):
             args['LoadMonitors']='Separate'
-            wrong_monitors_name = True
         elif ext.endswith('nxs'):
             args['LoadMonitors'] = '1'
 
         loaded_ws = Load(Filename=filename, OutputWorkspace=output_name,**args)
-        if wrong_monitors_name:
-            RenameWorkspace(InputWorkspace=output_name+'_Monitors',OutputWorkspace=output_name+'_monitors');            
         if isinstance(loaded_ws,tuple) and len(loaded_ws)>1:
             mon_ws = loaded_ws[1];
             loaded_ws=loaded_ws[0];