Merge remote-tracking branch 'origin/bugfix/8344_automatically_transp…

…ose_data_in_diagnostics'
mantidproject · Dec 2, 2013 · c342a16 · c342a16
2 parents c41dfa1 + eaae1a9
commit c342a16
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/SystemTests/AnalysisTests/ISISIndirectInelastic.py b/SystemTests/AnalysisTests/ISISIndirectInelastic.py
@@ -419,7 +419,7 @@ def _validate_properties(self):
 
 #------------------------- OSIRIS tests ---------------------------------------
 
-class OSIRISDiagnostics(ISISIndirectInelasticDiagnostics):
+class IRISDiagnostics(ISISIndirectInelasticDiagnostics):
 
     def __init__(self):
         ISISIndirectInelasticDiagnostics.__init__(self)
@@ -429,11 +429,11 @@ def __init__(self):
         self.suffix = 'graphite002'
 
     def get_reference_files(self):
-        return ["II.OSIRISDiagnostics.nxs"]
+        return ["II.IRISDiagnostics.nxs"]
 
 #------------------------- IRIS tests -----------------------------------------
 
-class IRISDiagnostics(ISISIndirectInelasticDiagnostics):
+class OSIRISDiagnostics(ISISIndirectInelasticDiagnostics):
 
     def __init__(self):
         ISISIndirectInelasticDiagnostics.__init__(self)
@@ -443,7 +443,7 @@ def __init__(self):
         self.suffix = 'graphite002'
 
     def get_reference_files(self):
-        return ["II.IRISDiagnostics.nxs"]
+        return ["II.OSIRISDiagnostics.nxs"]
 
 
 #==============================================================================

diff --git a/SystemTests/AnalysisTests/ReferenceResults/II.IRISDiagnostics.nxs b/SystemTests/AnalysisTests/ReferenceResults/II.IRISDiagnostics.nxs
diff --git a/SystemTests/AnalysisTests/ReferenceResults/II.OSIRISDiagnostics.nxs b/SystemTests/AnalysisTests/ReferenceResults/II.OSIRISDiagnostics.nxs