Skip to content
Snippets Groups Projects
Commit e3487f20 authored by WHITFIELDRE email's avatar WHITFIELDRE email
Browse files

Merge branch 'master' into snspowder_gui_bug_fix

parents 890a87f0 68342ed5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Framework/DataHandling/test/InstrumentRayTracerTest.h
+ 3
− 3
View file @ e3487f20
...@@ -49,9 +49,9 @@ public: ...@@ -49,9 +49,9 @@ public:
topazWS = WorkspaceCreationHelper::Create2DWorkspace(1, 2); topazWS = WorkspaceCreationHelper::Create2DWorkspace(1, 2);
AnalysisDataService::Instance().add("TOPAZ_2010", topazWS); AnalysisDataService::Instance().add("TOPAZ_2010", topazWS);
// Load a small test file // Load a small test file
FrameworkManager::Instance().exec("LoadInstrument", 6, "Filename", FrameworkManager::Instance().exec(
"TOPAZ_Definition_2010.xml", "Workspace", "LoadInstrument", 6, "Filename", "TOPAZ_Definition_2010.xml",
"TOPAZ_2010", "RewriteSpectraMap", "True"); "Workspace", "TOPAZ_2010", "RewriteSpectraMap", "True");
} }
~InstrumentRayTracerTestPerformance() { ~InstrumentRayTracerTestPerformance() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment