Commit 10b0d1b6 authored by Russell Taylor's avatar Russell Taylor
Browse files

Re #7778. Remove unneeded use of the AnalysisDataService.

parent 731948d0
......@@ -136,16 +136,6 @@ namespace DataHandling
m_idf_filename = ExperimentInfo::getInstrumentFilename(m_instrument);
g_log.debug() << "Loading instrument definition from " << m_idf_filename << "." << std::endl;
// Let's load the empty instrument
//IAlgorithm_sptr alg = AlgorithmFactory::Instance().create("LoadEmptyInstrument", 1);
//alg->initialize();
//alg->setPropertyValue("Filename", m_idf_filename);
//alg->setPropertyValue("OutputWorkspace", workspaceName);
//alg->execute();
//MatrixWorkspace_sptr ws;
//ws = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(workspaceName);
// Modified to call LoadInstrument directly as a Child Algorithm
ws = WorkspaceFactory::Instance().create("Workspace2D",1,2,1);
......@@ -321,10 +311,6 @@ namespace DataHandling
}
}
// Clean up the workspace
//AnalysisDataService::Instance().remove(workspaceName);
}
......
......@@ -407,7 +407,6 @@ namespace DataHandling
{
declareProperty(new WorkspaceProperty<IEventWorkspace>("OutputFilteredWorkspace", "WS_A", Direction::Output), "");
setProperty<IEventWorkspace_sptr>("OutputFilteredWorkspace", localWorkspaceBA);
// AnalysisDataService::Instance().addOrReplace("WS_BA", localWorkspaceBA);
}
// Add fast frequency sample environment (events) data to workspace's log
......
......@@ -58,12 +58,8 @@ namespace DataHandling
void LoadIsawDetCal::center(double x, double y, double z, std::string detname, std::string inname)
{
MatrixWorkspace_sptr inputW = boost::dynamic_pointer_cast<MatrixWorkspace>
(AnalysisDataService::Instance().retrieve(inname));
IAlgorithm_sptr alg1 = createChildAlgorithm("MoveInstrumentComponent");
alg1->setProperty<MatrixWorkspace_sptr>("Workspace", inputW);
alg1->setProperty("Workspace", inname);
alg1->setPropertyValue("ComponentName", detname);
alg1->setProperty("X", x);
alg1->setProperty("Y", y);
......
Markdown is supported
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