refs #8780. Merge branch 'feature/8780_coadd_in_quick' into develop

Conflicts: Code/Mantid/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py
mantidproject · Jan 30, 2014 · a06c037 · a06c037
2 parents 881c125 + 4e6837d
commit a06c037
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Code/Mantid/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py b/Code/Mantid/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py
@@ -17,8 +17,14 @@ def sum_workspaces(cls, workspaces):
         """
         return sum(workspaces)
 
+    @classmethod
+    def get_first_of_coadd_ws(cls, candidate):
+        return re.split(',|:', candidate)[0]
+
     @classmethod
     def to_single_workspace(cls, candidate):
+        if isinstance(candidate, str):
+            ConvertToWavelength.get_first_of_coadd_ws(candidate)
         ws = ConvertToWavelength.to_workspace(candidate)
         input = None
         if isinstance(ws, mantid.api.WorkspaceGroup):
@@ -31,6 +37,8 @@ def to_single_workspace(cls, candidate):
     @classmethod
     def to_workspace(cls, candidate):
         _workspace = None
+        if isinstance(candidate, str):
+            candidate = ConvertToWavelength.get_first_of_coadd_ws(candidate)
         if isinstance(candidate, mantid.api.Workspace):
             _workspace = candidate
         elif isinstance(candidate, str):